Issue #5636: Fix many bugs
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Merge pull request #529 from pandamicro/master

Issue #5636: Fix many bugs