Fixed #4667: Remove DEBUG preprocessor macro in templates
Merge branches 'master' and 'master' of https://github.com/cocos2d/cocos2d-js
Merge pull request #227 from pandamicro/master

Fixed #4667: Remove DEBUG preprocessor macro in templates