Fixed #5781: fixed bugs of ccui.LayoutParameter and ccs.ArmatureAnimation
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into Iss5781_ReleaseV3rc2
Merge pull request #2066 from dingpinglv/Iss5781_ReleaseV3rc2

Fixed #5781: fixed bugs of ccui.LayoutParameter and ccs.ArmatureAnimation
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into develop

Conflicts:
	cocos2d/core/platform/CCConfig.js