Update cocos2d-html5
Merge pull request #1195 from pandamicro/develop

Update cocos2d-html5