Fix propose_join in non-instance case
Redirect to entity_url after badge edit

This is mostly useful for category pages.
Fix "Comment" translation

for some strange reason, extract_messages extracts "Comment" as if it
were used with ngettext. This commit contains a workaround for this.
Merge pull request #940 from liqd/feature-redirect-to-category-page-after-edit

Redirect to entity_url after badge edit
Merge pull request #941 from liqd/feature-comment-translation

Fix "Comment" translation
Sort milestones by date secondarily by title

This is a requirement from a customer, but it also makes sense in
general.
Allow to restrict locale choice

Note that this just hides the other choices from the UI, but this should
be sufficient.
Gardening: Fix pep8
Allow to hide category navigation item
Allow to define post_logout_url
Fix badge form in overlay after validation error

If categories were edited from the category overview page, validation
error resulted in a broken overlay due to lost format information.

I don't know why this didn't occur when the overlay has been opened from
other sites, e.g. the proposal listings.
Merge pull request #943 from nidico/feature-fix-category-overlay-form

Fix badge form in overlay after validation error
Add CHANGES for 2.5.2
Merge tag '2.5.2' into feature-geo

Conflicts:
	src/adhocracy/config/__init__.py