Issue #5695: Update Facebook plugin
Issue #5695: Update Facebook plugin
Merge pull request #2043 from VisualSJ/develop-facebook

Issue #5695: Update Facebook plugin
Issue #5702: fixed a bug of ccs.ColliderDetector
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into Iss5702_Armature

Conflicts:
	extensions/cocostudio/armature/CCArmature.js
issue #5685: refactor ctor & create of ccui
Merge pull request #2044 from joshuastray/ccui_create

issue #5685: refactor ctor & create of ccui
Closed #5702: Fixed a bug of cc.Armature's drawContour
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into Iss5702_Armature
Fixed #5783: Add Action3d lower case alias creation functions
Merge pull request #2046 from dingpinglv/Iss5702_Armature

Closed #5702: migrate Cocostudio Armature from -x v3.2 rc0
Fixed #5782: Improve comments
Fixed #5782: Move lower case creation functions definitions
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into develop
Fixed #5782: Refactored all progress actions to lower case creation function
Issue #2037: Text wrap method
Merge pull request #2048 from VisualSJ/develop-rc2_test

Issue #2037: Text wrap method
Merge pull request #2047 from pandamicro/develop

Fixed #5783: Refactor all Actions lower case alias creation functions
issue #5685: fix bugs of create functions
Merge pull request #2049 from joshuastray/ccui_create_bug

issue #5685: fix bugs of create functions