location page
Merge branch 'master' of https://github.com/johaasi/High8

Conflicts:
	js/app.js
merge