Recompile main.css
Merge branch '368-new-history-page-2' of github.com:okfn/ckan into 368-new-history-page-2

Conflicts:
	ckan/templates/group/snippets/revisions_table.html
	ckan/templates/revision/diff.html
	ckan/templates/revision/list.html
	ckan/templates/revision/read.html
Use the activity api for the tests
Merge branch 'master' into 283-activity-stream-fixes
[#288] Fix for unicode/latin1 .ini values
[#638] Clean up some imports and remove OrderedDict redefine
[#517] Debug patch
[#638] Use correct function
[#517] Update correct config
[#517] Use correct config for paster
[#517] Does this work?
[#602] Deprecate IDatasetForm's check_data_dict

With the new three-stage dataset creation form in CKAN 2.0
check_data_dict() no longer works as intended. For example,
DefaultDatasetForm's check_data_dict() breaks any IDatasetForm plugins
that are trying to use convert_to_extras() (if they inherit from
DefaultDatasetForm).

Remove the method from IDatasetForm and DefaultDatasetForm, but still
call the method in all the places it would previously have been called
_if_ the active IDatasetForm plugin has the method.

Also remove three tests that seem to be testing check_data_dict()'s
behaviours.

Note that in the existing code, check_data_dict() seems to be called
twice when creating a package, once by the package controller and once
by package_create(), and the two are inconsistent in the number of
params they expect check_data_dict() to take! On updating a package it's
called just once, by package_update(). I have preserved these "legacy"
behaviours.

Also note that IGroupForm and IOrganizationForm still have
check_data_dict() methods, we probably want to get rid of them in the
future as well.
Merge branch 'master' of github.com:okfn/ckan into example_idatasetform_without_tests_second_try

Conflicts:
	doc/tag-vocabularies.rst
[#517] Actually import the requirements
[#636] Fix deleted members having rights
[#517] Hopefully this fixes 8.4 tests
[#2750] Add DefaultDatasetForm to plugins toolkit

At DefaultDatasetForm to the plugins toolkit. This means that
IDatasetForm plugins based on DefaultDatasetForm no longer need to
import ckan.lib.plugins.

Also change ExampleIDatasetForm to no longer import ckan.lib.plugins.
[#639] Clean logic.auth.update
[#517] Remove datastore.read_url for 8.4
[#2750] Use ITemplateHelpers not setup_template_variables()

In ExampleIDatasetForm use ITemplateHelpers not
setup_template_variables() to pass the list of available country codes
to the template. This greatly reduces the number of templates that need
to be overridden!