Merge branch 'hotfix/etlogo'
Merge branch 'development'
logo fix
logo fix
merge assets deleted
hack
Merge branch 'hotfix/cat_delete' into development