Install angular-touch
Merge branch 'master' of github.com:tmlayton/globalhack

Conflicts:
	app/index.html
	bower.json
	public/index.html