Update cocos2d-html5
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Merge pull request #111 from pandamicro/master

Update cocos2d-html5