Merge branch 'master' of github.com:datagovuk/ckan

Conflicts:
	ckan/lib/base.py
	ckan/lib/search/__init__.py
	doc/solr-setup.rst
Merge branch 'master' of github.com:okfn/ckan
Recompile css
Merge branch 'master' into 1038-organization-hierarchy
Merge branch '1124-ie7-language-dropdown-fix'
Recompile css
[#1127] pass image_url in organization_list_for_user
[#1127] pass image_url in group_list_authz
Merge pull request #1127 from okfn/1127-org-images-dashboard

Organization images do not display on Organization user dashboard page
[#1128] Fix requirements file name in documentation
Merge pull request #1129 from okfn/1128-requirements-filenames-outdated

[#1128] Fix requirements file name in documentation
[1130] various db upgrades
Merge branch 'master' into 547-plugins-love
[#1117] Add a few new-style tests for user_update auth
[#1117] Never return reset_keys in user dicts

Like the user's password, there's never any reason for a user dict to
contain their reset key (even if the user dict is being generated for
the user herself or for a sysadmin)
[#1117] Add docstring and unit tests for ignore_missing validator
[#1117] Add another ignore_missing test
[#1117] Add some asserts to ignore_missing tests
[#1117] Tweak a unit test
[#1117] Combine three unit tests into one