Some more login/login logic and view changes
Merge branch 'v1.0' into develop
Merge branch 'develop'