Updated location text and nav
Merge branch 'master' of github.com:Synesso/yogadiz

Conflicts:
	css/timetable.css