Amends to login
??

??
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	.gitignore