[Kali] Header and buttons on map
Merge branch 'master' of https://github.com/carlosvillademor/myJourney

Conflicts:
	static/css/main.css