Fixed #5674: [JSB]Add defaultPixelFormat property definition
Update submodules
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Merge pull request #563 from pandamicro/master

Fixed #5674: [JSB]Add defaultPixelFormat property definition
move jsb scripts to assets/script/
Merge pull request #564 from mutoo/master

move jsb scripts to assets/script/
Guard for glReleaseShaderCompiler define

The `glReleaseShaderCompiler` macro is also defined in CCGL.h (at least on Mac builds). Adding this guard prevents the macro from being redefined.
fix cocoslib_path
Update the reference of submodule cocos2d-console.
Merge pull request #567 from natural-law/master

Update the reference of submodule cocos2d-console.
Merge pull request #565 from NatWeiss/patch-2

Guard for glReleaseShaderCompiler define
Merge pull request #566 from mutoo/master

fix cocoslib_path
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