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 Cocos2d-html5
Merge pull request #242 from pandamicro/master

Fixed #4571: Fixed API inconsistence for DrawNode