changed login view, version 2
Merge remote-tracking branch 'origin/develop' into develop