Refactor #5684 : Add 2.x createWithXXX functions to support old API, deprecate all create.* functions
Issue #5702: Fixed a bug about CCDataReaderHelper
Merge branch 'Iss5702_Armature' of https://github.com/VisualSJ/cocos2d-html5 into Iss5702_Armature
Merge pull request #2042 from joshuastray/deprecate_create

Refactor #5684 : Add 2.x createWithXXX functions to support old API, dep...
Issue #5072: Fixed two bugs of ccs.DataReaderHelper and ccs.Skin
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