Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
Update plugin-x
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
Merge pull request #833 from pandamicro/develop

Update plugin-x