Merge branch 'hotfix/current_user'
Merge branch 'development'
css
merge
Merge branch 'development'
finish
bug fixes
Merge branch 'hotfix/error' into development