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.
Update the android project files for the new implementation of cocos2d-x.
Merge pull request #239 from natural-law/master

Update the android project files for the new implementation of cocos2d-x.
Fixed #4720: Fix API inconsistence for functions and constants in CCMacro.js
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Fixed #4571: Fixed API inconsistence for DrawNode