new version
Merge branch 'working' into develop
fixed loginvie