Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into Iss5702_Armature

Conflicts:
	extensions/cocostudio/armature/display/CCDisplayManager.js
Merge branch 'armture' of https://github.com/VisualSJ/cocos2d-html5 into Iss5702_Armature
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into Iss5702_Armature
Fixed #2022: Newline character not properly applied in labels
Merge pull request #2025 from VisualSJ/develop-LabelTTF

Fixed #2022: Newline character not properly applied in labels
Issue #5702: migrate cc.Armature from -x
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into Iss5702_Armature
Issue #5702: update CCSkin、CCBone
Merge branch 'Iss5702_Armature' of http://github.com/dingpinglv/cocos2d-html5 into armture