blocking function for move, (hard to test)
Merge branch 'master' of https://github.com/moiri-gamboni/travellog

Conflicts:
	assets/js/controllers.coffee
	static/js/controllers.js