Merge pull request #296 from pandamicro/master

Refactor #3585: Add CCFormatHelper into build files
Fixed #3501: modify some codes for NPM
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js-tests into Iss3501_ReleasingV2.2.2
Merge pull request #297 from dingpinglv/Iss3501_ReleasingV2.2.2

Fixed #3501: modify some codes for NPM