[#678] Moves the position of the modal into the correct position in center of screen
Merge branch 'release-v2.0' of github.com:okfn/ckan into release-v2.0
[#654] Allow activity streams to be disabled via config

Conflicts:

	ckan/tests/functional/api/test_activity.py
[#654] Document activity streams config option
[#485] Remove colour padlock from license snippet
[#485] Put back endif
[#683] Remove author for resource page
[#636] Fix deleted members having rights
[#636] Check we set state to active
[#636] Fix group auth tests.

A partial update was removing members
from a group so at the next call to group_update
authorization was denied. The whole group dict
is now fetched using group_show before being
updated.

Also some PEP8 fixes.
[#664] Fix Group selector in dataset forms
[#669] Fix member_list call when given valid group name.

Now returns lists of (id, type, capacity) tuples
where type is a string. Previously, type was a
Python class object which could not always be
serialized to JSON in the API controller.
[#669] PEP8
[#669] Raise NotFound if group is not found in member_list.

Allows a proper error to be generated in the API
controller instead of just giving a 500 error.
[#669] Tidy up imports
[#671] Use render_markdown() for custom about page text

Use render_markdown() not markdown_extract() for custom about page text,
so that the full text gets shown not just an extract. Fixes #671.
[#532] remove doc/administrative-datshboard.rst
[#586] Adds error_summary to add stage 3 and tidies up errors after bootstrap upgrade
[#288] Fix for unicode/latin1 .ini values
[#421] Adds tag index page