Merge branch '1197-rtd-fix'
Merge branch 'master' of github.com:okfn/ckan
[#1197] Downgrade Sphinx to fix search on RTD

There is a bug on RTD that prevents the search when using Sphinx 1.2b1.

All details here:

https://github.com/rtfd/readthedocs.org/issues/443
Merge branch '1197-rtd-fix'
[#847] Add a TODO
Merge pull request #1184 from okfn/1184-package_create-auth-fixes

Site user can not create datasets
Merge branch 'master' into 1078-package_show-performance
[#1078] metadata_modified matching so that only get out from solr when datetimes are similar and minor exception cleanup
fix merge conflict
Merge pull request #1177 from okfn/refactoring_activity_details

Move logic of getting ActivityDetails' by activity_id to its model
Merge pull request #1078 from okfn/1078-package_show-performance

package_show could be faster
Merge pull request #938 from okfn/938-datapusher

Push data to the datastore (includes #940 and #981)
[#1210] Add auth_user_obj to context in check_access

If not already there or ignore_auth is True, and the context has a user
name, try to see if the user actually exists in the DB, and store the
object (or None if not found) in context['auth_user_obj']. The check if
performed only once per context object.
Merge branch 'master' of github.com:okfn/ckan into 1038-organization-hierarchy
[#938] Prepend config option with ckan.
[#1196] Move datapusher tests
[#1183] Remove datapusher_enabled action and move before_show to datstore. Instead of using the action or the template helper, check whether the plugin is enabled. Moved the action so that changing the url works even if the datapusher is disabled.
Merge branch 'master' into 1200-datastore-read-only

Conflicts:
	ckanext/datastore/tests/test_create.py
PEP8
[#1211] Add exception guidelines to Python coding standards