fixed sign in
fixed minor bug
Merge branch 'master' into develop
fixed merge conflict