Login field fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	LocaLoca/app/src/main/res/layout/activity_login.xml