Rename the library file name of uc SDK.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
issue #2412:remove platform.cpp/.h
issue #2412:remove blackberry and marmalade port because they don't support c++11
updated emscripten script so there is no need to edit it to make emscripten work
Merge pull request #3212 from azmeuk/emscripten-script

closed 2419: Updated emscripten-build.sh
Update AUTHORS [ci skip]
issue #2412:fix merging conflict
issue #2412:remove platform.h/.cpp from vs project
Merge pull request #3218 from minggo/iss2412-refactor_platform

remove some files
issue #2416, Add ProtocolSocial for android platform.
issue #2378: Setter/Getter for CCTexture2D, removing CC_PROPERTY_XXX macros.
closed #2393:fix a bug caused by marking functions as deprecated
Merge pull request #3220 from minggo/develop

closed #2393:fix a bug caused by marking functions as deprecated
issue #2378: Setter/Getter for TextureAtlas, removing CC_PROPERTY_XXX macros.
issue #2416, Add ProtocolSocial for iOS platform.
closed #2416, Add social plugin : SocialNd91 & add sample code for social plugins.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
issue #2378: Setter/Getter for Director, removing CC_PROPERTY_XXX macros.
issue #2378: Setter/Getter for AtlasNode, removing CC_PROPERTY_XXX macros.