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
Update the reference of submodule cocos2d-console.
Merge pull request #241 from natural-law/master

Update the reference of submodule cocos2d-console.
Update Cocos2d-html5
Merge pull request #240 from joshuastray/master

Fixed #4724 : add _ctor in jsb for SpriteFrame,Grid3D,TileGrid3D,GridBas...
Merge pull request #242 from pandamicro/master

Fixed #4571: Fixed API inconsistence for DrawNode
Fixed #4726:Fix bugs in JSB-moonwarriors