read config.json may failed caused by syntax error
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
Merge pull request #798 from cocoscodeide/develop

read config.json may failed caused by syntax error
new cc.ScrollView(size, node) bug fix

new cc.ScrollView(size, node) dosen't work on native device.
update bindings-generator ref to refactoring auto binding code
issue #5959 : convert all tabs to 4 spaces in manual binding code
update bindings-generator ref
fix cocos console ref changed by mistake
Merge pull request #807 from joshuastray/fix_indentation

issue #5959 : convert all tabs to 4 spaces in binding code
[AUTO] : updating jsbinding automatically
change script file modified time will cause Cocos Code IDE reload file.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
runtime template support Xcode6
Merge pull request #808 from CocosRobot/update_js_bindings_1411897656

[AUTO] : updating jsbinding automatically
Merge pull request #810 from cocoscodeide/develop

change script file modified time will cause Cocos Code IDE reload file.
Update the reference of submodule cocos2d-console.
Merge pull request #815 from natural-law/develop

Update the reference of submodule cocos2d-console.
Merge pull request #804 from sincntx/develop

new cc.ScrollView(size, node) bug fix
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into facebook

Conflicts:
	tools/cocos2d-console