Merge pull request #1464 from pandamicro/NPM

Remove url check for home modules directories
issue #3541 : Fix a bug when loading js from server.
Merge branch 'NPM' of https://github.com/cocos2d/cocos2d-html5 into iss3541_4_testCase
Merge pull request #1465 from SmallAiTT/iss3541_4_testCase

issue #3541 : Fix a bug when loading js from server.
fixed #3541: sync develop source codes to NPM
Merge pull request #1466 from dingpinglv/NPM

fixed #3541: sync develop source codes to NPM
Merge branch 'NPM' of https://github.com/cocos2d/cocos2d-html5 into iss3541_4_testCase
issue #3541 : Update subTitles.
Merge pull request #1467 from SmallAiTT/iss3541_4_testCase

issue #3541 : Update subTitles.
Add TouchPropagationTest to cctouch test cases
Merge branch 'NPM' of https://github.com/cocos2d/cocos2d-html5 into NPM

Resolve Conflicts:
	node_modules/cctouch/cfg/resCfg.js