Merge branch 'dev'
Merge branch 'dev'
Improve Login page
Add user avatar