Login changes
login changes

Conflicts:
	war/login.html