Merge branch 'master' into dev
Bugfixes after first beta test
Preparations before workshop