Added login/register
Merge branch 'master' of https://github.com/ader1990/smarthouse

Conflicts:
	mobile_app/Resources/alloy/controllers/afterland.js