# Conflicts:
#	src/app/components/shared/header/header.component.html
#	src/app/components/shared/header/header.component.ts
#	src/app/components/shared/tag-cloud/tag-cloud.component.ts

Merge Request for Feature tag-cloud

See merge request arsnova/topic-cloud!6

Deleted launch.json

Fixed period filters not being set if not done in filterTimePeriod

Merge branch 'questions-to-be-selected' of git.thm.de:arsnova/topic-cloud into questions-to-be-selected

Added cloud icon for Topic Cloud Dialog

Added layout for group 4, added alphabetical sort and dynamic css, finished tasks from last meeting.

Added layout for group 4, added alphabetical sort and dynamic css, finished tasks from last meeting.