Merge pull request #24 from chuanweizhang2013/master

update cocos2d-js
Merge branch 'master' of https://github.com/cocoscodeide/cocos2d-js