Commits

Merge branch 'master' into feature/singup-facebook # Conflicts: # src/com/net/RestApi.as # src/com/screen/VScreenViewChannel.as # src/com/screen/profile/ProfileLoginScreen.as # src/com/screen/renderer/ItemRendererChat.as # src/com/screen/room/VideoPlayer.as # src/com/screen/room/video/VPStreamScreen.as