login restructured
login and apartment
merge
Merge pull request #68 from worxli/develop

login restructured