Finish sign in
Merge branch 'develop'