add hammer.js; change path to hammer; remove unused js paths
Merge remote-tracking branch 'remotes/origin/master' into routing

Conflicts:
	index.html

-remove unused js paths