Merge branch 'hotfix/config-fix' into develop
Merge branch 'hotfix/content-fix' into develop
Merge branch 'hotfix/I-is-stupid' into develop
update logo's
Merge branch 'release/logo-update'