Merge pull request #1295 from dingpinglv/DevelopToMaster

Push developer branch to master branch
Merge branch 'NPM' of https://github.com/cocos2d/cocos2d-html5 into Iss3541_TestingNPM
Merge branch 'NPM' of https://github.com/cocos2d/cocos2d-html5 into Iss3541_TestingNPM
Issue #3541: add cctextinput tests
Merge branch 'NPM' of https://github.com/cocos2d/cocos2d-html5 into Iss3541_TestingNPM
Issue #3541: add tilemap tests for NPM testing.
Merge branch 'NPM' of https://github.com/cocos2d/cocos2d-html5 into Iss3541_TestingNPM
Issue #3541: add Transition, cocosbuilder, core tests for NPM testing.
Merge branch 'NPM' of https://github.com/cocos2d/cocos2d-html5 into Iss3541_TestingNPM
Issue #3541: add LabelTTF and Layer tests for NPM testing
Merge branch 'NPM' of https://github.com/cocos2d/cocos2d-html5 into Iss3541_TestingNPM
Merge pull request #1403 from dingpinglv/Iss3541_TestingNPM

Issue #3541: add some tests for NPM testing
Merge pull request #1404 from SmallAiTT/iss3541_4_testCase

issue #3541 : Update the display of TextConsole. Add test cases for ccactions3d.
issue #3541 : Change the way for testBase in resCfg. Change resCfg.gameModules to cc.gameModules.