Merge pull request #1513 from pandamicro/develop

Merge develop to develop-3.0
Merge branch 'develop-3.0' of https://github.com/cocos2d/cocos2d-html5 into develop