Fixes for login
Merge branch 'master' of github.com:avillalain/ftd-web

Conflicts:
	public/scripts/security/services/auth.js