Merge commit '82459870e6f00fbe666a88ee279ee0c553345d95' into develop. close #126.

# By Sergei
# Via Sergei
* commit '82459870e6f00fbe666a88ee279ee0c553345d95':
  Fix improper use of NSLocalizedDescriptionKey.

Conflicts:
	SocketIO.m

Author: pkyeck

SocketIO.m

@@ -678,7 +678,7 @@ - (void) connection:(NSURLConnection *)connection didFailWithError:(NSError *)er
 
     if ([_delegate respondsToSelector:@selector(socketIO:onError:)]) {
         NSMutableDictionary *errorInfo = [[NSDictionary dictionaryWithObject:error
-                                                                      forKey:NSLocalizedDescriptionKey] mutableCopy];
+                                                                      forKey:NSUnderlyingErrorKey] mutableCopy];
 
         NSError *err = [NSError errorWithDomain:SocketIOError
                                            code:SocketIOHandshakeFailed