fixed #2082 Merge branch 'develop' of Cocos2d-html5