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 pull request #32 from cocos2d/master

update cocos2d-js
Merge branch 'master' of https://github.com/chuanweizhang2013/cocos2d-js
Merge branch 'master' of https://github.com/cocoscodeide/cocos2d-js
fixed release error
Add support keep creen on when  debuging
Merge pull request #59 from chuanweizhang2013/master

update cocos2d-js template
Merge pull request #60 from cocos2d/master

update js
Merge pull request #61 from cocos2d/master

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

update cocos2d-js
custom console port
support window top
fixed android x86 bug
--
Merge branch 'master' of https://github.com/chuanweizhang2013/cocos2d-js
adjust regist function position
Merge branch 'master' of https://github.com/cocoscodeide/cocos2d-js
Merge pull request #63 from cocos2d/master

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