Merge pull request #57 from cocos2d/master

update cocos2d-js
Merge pull request #58 from cocos2d/master

update cocos2d-js
fixed transfer file error while  file size is 0
Merge branch 'master' of https://github.com/chuanweizhang2013/cocos2d-js
Merge branch 'master' of https://github.com/cocoscodeide/cocos2d-js
fixed release error