add parent category help text
Update changelog
Merge branch 'develop' into geo

Conflicts:
	src/adhocracy/i18n/de/LC_MESSAGES/adhocracy.mo