conforming to new module header convention
Merge branch 'master' into cocos2dx-v2