Merge branch 'master' into feat/friends

# Conflicts:
#	Assembly-CSharp-Editor.csproj
#	Assembly-CSharp.csproj
#	Assets/TapBootstrapSDK/Plugins/TapBootstrapSDK.dll
#	Assets/TapCommonSDK/Plugins/Android/libs/TapCommon_1.1.11.aar.meta
#	Assets/TapDBSDK/Plugins/TapDBSDK.dll
#	Assets/TapMomentSDK/Plugins/TapMomentSDK.dll
#	Assets/TapTap/Bootstrap/Plugins/TapTap.Bootstrap.pdb
#	Assets/TapTap/Common/Plugins/Android/libs/TapCommon_1.1.11(1).aar
#	Assets/TapTap/Common/Plugins/Android/libs/TapCommon_1.1.11(1).aar.meta
#	Assets/TapTap/Common/Plugins/Android/libs/TapCommon_1.1.11.aar
#	Assets/TapTap/Common/Plugins/Android/libs/TapCommon_1.1.11.aar.meta
#	Assets/TapTap/Common/Plugins/TapTap.Common.dll
#	Assets/TapTap/Common/Plugins/TapTap.Common.pdb
#	Assets/TapTap/Moment/Plugins/TapTap.Moment.pdb
#	Assets/TapTap/TapDB/Plugins/TapTap.TapDB.pdb
#	ProjectSettings/ProjectSettings.asset
#	TapSDK2-Unity.sln.DotSettings.user
#	TapTap.Bootstrap.Editor.csproj
#	TapTap.Common.Editor.csproj
#	TapTap.Login.Editor.csproj
#	TapTap.Moment.Editor.csproj
#	TapTap.TapDB.Editor.csproj
#	compile.sh

Plugins/iOS/TapCommonSDK.framework/Headers/TDSWSWebSocket.h

@@ -100,9 +100,10 @@
 - (nonnull instancetype)initWithURL:(nonnull NSURL *)url protocols:(nullable NSArray*)protocols callbackQueue:(nonnull dispatch_queue_t)callbackQueue connectTimeout:(NSTimeInterval)connectTimeout;
 
 /**
- connect to the host
+ connect to the host - blocking
+ @return YES if successfully connected
  */
-- (void)connect;
+- (BOOL)connect;
 
 /**
  disconnect to the host. This sends the close Connection opcode to terminate cleanly.

Plugins/iOS/TapCommonSDK.framework/Headers/TapCommonSDK.h

@@ -15,8 +15,6 @@ FOUNDATION_EXPORT const unsigned char TapCommonSDKVersionString[];
 
 // In this header, you should import all the public headers of your framework using statements like #import <TapCommonSDK/PublicHeader.h>
 
-#define TapCommonSDK_VERSION        @"2.0.0"
-
 #import <TapCommonSDK/TapConfig.h>
 #import <TapCommonSDK/TDSAccountProvider.h>