Merge branches 'develop' and 'develop' of https://github.com/cocos2d/cocos2d-js into develop
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
#1149: Upgrade -x to v3.3 rc1
Merge pull request #1155 from pandamicro/develop

#1149: Upgrade -x to v3.3 rc1