Fixed #4675: Parse error notification for project.json in JSB added
Update submodules
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Merge pull request #234 from joshuastray/master

fixed Bug #4572:Bind pAdd, pSub, pMulti in JSBinding
compartment
Merge pull request #235 from Ryeeeeee/issue_compartment_annoEvaluate

specify compartment before calling function.
Update submodules
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Update auto bindings
Merge pull request #237 from pandamicro/master

Fixed #4675: Parse error notification for project.json in JSB added
Update the templates & reference of cocos2d-console.
Merge pull request #238 from natural-law/master

Update the templates & reference of cocos2d-console.