Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Merge branch 'master' of https://github.com/cocoscodeide/cocos2d-js
fixed prebuild 1.3
Merge pull request #73 from chuanweizhang2013/master

fixed prebuild 1.3