fixed android file recive
write file w -->wb
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
merge Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
add js debuge files
fixed lib gui error
Merge branch 'master' of https://github.com/chuanweizhang2013/cocos2d-js
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js

Conflicts:
	templates/js-template-default/js-template-default.json
git reset --hard ae8399
reset cocos2d-console
tab -> space
add lib for android
[AUTO] : updating jsbinding automatically
remove self delegate
Merge pull request #45 from CocosRobot/update_js_bindings_1394081877

[AUTO] : updating jsbinding automatically
Merge pull request #46 from lihex/master

rename the template config file & update submodule
Refactor #4290: Migrate MoonWarriors into Cocos2d-js