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
TouchPropagationTest: Use cc.LayerColor instead of cc.DrawNode
Remove dependency of CCDrawNode
Merge pull request #1481 from pandamicro/NPM

Add TouchPropagationTest to cctouch test cases