Merge branch 'hotfix/3.1.1'
Merge branch 'release/3.2'
Merge branch 'release/3.2.1'
Merge branch 'release/3.3'
Cleaning up the SiteConfig Settings. This is more readable and more easy to adjust. Also less of a bunch of fields :)