Merge branch '1231-best-practices-for-writing-extensions-mistake'
Merge branch 'master' of github.com:okfn/ckan into 1199-fix-package-owner-org-edit
Merge pull request #1230 from okfn/1230-additional-info-extras-block

add template block for extras in package/snippets/additional_info.html
Merge pull request #1225 from okfn/1225-reset-template

Breadcrumbs on password reset page links to register
[#1126] Added stats and new layouts 2 and 3 for homepage
[1200] add defaults and make sure datapusher down does not cause errors
[#1235] Add image block to be able to replace only the image easily
[#1235] Add block for content of container to allow people to add something to the left of the account block
Merge branch 'master' into 1210-auth-checks-improvements

Conflicts due to changes in the docstrings for #943. Added relevant
missing bits.

Conflicts:
	ckan/logic/__init__.py
	ckan/plugins/interfaces.py
	doc/toolkit.rst
[#1210] check_access should always get an action name
[#1210] Fix test in ExampleIAuthFunctions Plugin
[#1210] pep8 fix
Merge branch '1199-fix-package-owner-org-edit'
Merge pull request #1210 from okfn/1210-auth-checks-improvements

Auth checks improvements for logged in users
[#847] Tweak a theming example
[#847] Improve custom snippet example
[#847] Correct a couple of typos
[#847] Tweak warning about snippet overriding
[#1237] Improve facet.limit search option

A negative value should be allowed if you don't want to limit the facet
values, but the search params schema didn't allow it. Also mention in
the docs that this can be set via configuration and that the default is
50. Added some tests.
[#847] Add note about snippet filenames