move location icon into header bar
Merge branch 'master' of https://github.com/huaraco/foodie

Conflicts:
	index.html