fixed stuttering during sliding
cleanup
Merge branch 'master' of https://github.com/moiri-gamboni/travellog

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