TODO rewrite user login
Merge branch 'development'
Merge branch 'development'