server update - new emotion categories in topic
Merge branch 'dev' into feature/new-emotion-categories
Bugfixed
Gitignore + a couple of changes
push
Merge branch 'feature/new-emotion-categories' into dev