Merge tag '2.1' into develop

Version 2.1
Require contao-community-alliance/dc-general 2.0.0-beta21.
Update header and footer of the settings dialoge.
Merge branch 'release/2.2'