made some changes to login
Merge https://github.com/macmania/iva.com

Conflicts:
	front/login.html