typo
Merge branch 'develop' into hhu

Conflicts:
	etc/adhocracy.ini.in