Login update 3
Merge branch 'master' of https://github.com/howlinwinlaptop/app

Conflicts:
	app/eclipse/classes/controllers/ApplicationForm.class