Merge branch 'master' of github.com:ckan/ckan into 781-improve-ifacets-docs

Conflicts:
	setup.py
[#781] Finish the IFacets docstrings
[#781] Remove the example IFacets plugin

It has no tests, and I'm not going to write any for it right now.
Fix typo endit -> edit
[#1550] Initialize correctly the status of the image-upload
[#1550] Remove "Remove" button, as we now only use the "X" at the input
Merge pull request #1628 from ckan/809-string-i18n-docs

[#809] Add i18n guide for devs
Merge branch '1573-new-translations-policy'
Merge branch 'master' of github.com:ckan/ckan
Merge branch 'master' of github.com:ckan/ckan into 1505-invite-to-organization-causes-error
[#1505] Remove assertions that group_member_create was called in the tests

If user_invite fails when group_member_create fails, and succeeds when
group_member_create succeeds, there's no need to assert that
group_member_create was actually called.
[#1505] Instead of accessing and then deleting an attribute, simply pop() it.
[#1532] Use only {{ }}, not {% %}

We don't need multiple ways of calling the same method.
Merge branch 'master' into 1251-resource-view
[#1573] Add new translations policy to docs
[#809] Add i18n guide for devs

Fixes #809
[#1564] Add beginner contribution docs on 'Good for Contribution'
[#1639] Fix bug when loading the users from ckan.hide_activity_from_users

The problem was that we did set ```user_list```, but never used it.
[#1251] Re-add ckan.model import removed by mistake in 00bea6d

This fixes a few tests.
Remove duplicate 'the'.