Validate that chosen parent instance matches
Validate that category tree doesn't create cycles
show openid-login only if enabled (default)
Fix missing parantheses

Addendum to a9306e5bcbeafa9d6a167d70dede7527f5c329e3.
Merge branch 'develop' into votedetail

Conflicts:
	src/adhocracy/model/__init__.py
Bump migration number
Allow to assign past milestones to proposals if permissions given
Readable tuple unpacking
Autofocus first field in new badge form
Manage instance-only badges in instance settings only

Previously, badges from other instances could be managed within the
instance settings of another instance or from the global settings. This
would lead to very long lists in the category parent chooser if
implemented properly and isn't intuitive anyway.
Refactor Badge.get_key in order to make it reusable
Fix hierarchical category creation UI

* Use flat list with hierarchy breadcrumbs instead of optgroups, which
don't work in multi-level hierarchies.
* Group parent categories by global / local instance.
Improve description of select_child_description field
Merge pull request #270 from liqd/feature-95-hierarchical-badges

Hierarchical categories (#95)
Fix changed attribute name

Addendum to d92648f175b103966901e58a5e6575d8dc052dc1
Disallow selecting category parents which are children of self

This has been checked previously ("you shall not create cycles"), but is
now impossible in the UI in the first place.
Adapt sysv-init to virtualenv-less installations
Merge branch 'develop' into feature-191-thumbnail-badges

Conflicts:
	src/adhocracy/controllers/badge.py
	src/adhocracy/lib/helpers/badge_helper.py
	src/adhocracy/lib/pager.py
	src/adhocracy/model/badge.py
	src/adhocracy/templates/pager.html
	src/adhocracy/tests/lib/test_helper.py
	src/adhocracy/tests/model/test_badges.py
Make IPython available in production installations

In the buildout restructuring, IPython was moved to the developtools
buildout, which is only included in development environment.

However IPython, is also useful in production environments, and
therefore moved from the `developtools.cfg` buildout to the
`adhocracy.cfg` buildout.
Make came_from work with relative urls in login/redirect