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
remove self delegate
update compile android
Merge branch 'master' of https://github.com/chuanweizhang2013/cocos2d-js
Merge pull request #48 from chuanweizhang2013/master

fixed template errors