refactored login
Merge branch 'master' of github.com:moiri-gamboni/travellog

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