[#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
[#1214] Removed unecessary closed div as it was breaking the templates
Fix bug in (group|organization)_member_create

According to the documentation, the "username" parameter accepts either name or
id, but the code only accepted name. I've fixed it to accept both.
[#1236] Changes header on sidebar to be more relevant to content
Merge pull request #1214 from okfn/1214-add_member_page

Sidebar displaced on Add members page
Merge pull request #1236 from okfn/1236-forgotten-password-string-change

Forgotten details or password?
[#1243] Add tests to group_member_create.
Merge branch 'master' into 1243

Conflicts:
	ckan/tests/logic/test_action.py
Merge pull request #1243 from okfn/1243

(group|organization)_member_create only accepts username (and not id)
Correct typo in CHANGELOG, forntend -> frontend.
Merged master
Merge pull request #1235 from okfn/1235-new-template-blocks

Additional template blocks needed
Merge branch 'master' of github.com:okfn/ckan into 1117-start-new-test-suite
[#1117] Discourage overuse of mocking

Tweak the testing guidelines to discourage overuse of mocking.
[#1117] Add another example to testing guidelines
[#1117] Testing guidelines small tweaks