Revert "Merge branch 'develop' of https://github.com/jianglong0156/cocos2d-js into develop"

This reverts commit ec0382306e95ec36d7a1274141e0c85880add4cf, reversing
changes made to 3f35f92c11e31b0a71c914181b25db2c07d119e9.