Merge branch 'hotfix/logo'
Merge branch 'development'
logo
Merge branch 'development'
fix
Merge branch 'hotfix/current_user' into development