history navigation fixed
Merge branch 'master' of https://github.com/moiri-gamboni/travellog

Conflicts:
	static/js/controllers.js