Redid login with play intern
Merge commit 'ab5767c95f39ec56d2f212c1f8f4a6931848e127'
reverts commit ab5767c95f39ec56d2f212c1f8f4a6931848e127.

Conflicts:
	homy/app/controllers/Login.java
	homy/eclipse/classes/controllers/Login.class

Conflicts:
	homy/.classpath
	homy/.project
	homy/app/controllers/Application.java
	homy/app/controllers/Security.java
	homy/conf/routes
	homy/eclipse/Test homy.launch
	homy/eclipse/classes/Bootstrap.class
	homy/eclipse/classes/controllers/Application.class
	homy/eclipse/classes/controllers/Deposit.class
	homy/eclipse/classes/controllers/Secure.class
	homy/eclipse/classes/controllers/Security.class
	homy/eclipse/classes/controllers/Task.class
	homy/eclipse/classes/models/Room.class
	homy/eclipse/homy.launch
	homy/modules/secure
	homy/modules/secure/commands.pyc