Consistent instance settings and user settings
Merge branch 'master' of https://github.com/hhucn/adhocracy.hhu_theme