Merge branch 'develop'
Merge branch 'develop'
Add mercurial dependency for django-livesettings repo
Update README.md
Update README.md
Clarify the multi-org nature of econsensus, its default email behaviour, and how to start using it.
Merge branch 'develop'
Merge branch 'master' into develop
Updated README with some notes on contributing - we want to avoid contributors working on master as this can cause conflicts
Merge branch 'master' into develop
Fixed duplicate h2 in organization add/edit form - the parent template
creates an h2 containing the text supplied in the 'title' django block
so we needn't define our own h2 in this template, just supply the
contents to the 'title' block.
Merged in pull request 121 from Philip to lock down org detail screen to
admins only -
https://aptivate.kanbantool.com/boards/5986-econsensus#tasks-1388749
Use the newly working (thanks to Phil) Organization.is_owner(user)
method instead of long chain from org to user.
Minor comment changes.
Added docstring to test method.
Augmented TestCustomOrganizationAddForm.test_slug_generated_from_name so
that it tests that the slug that's auto-generated is unique.
Minor tidying to TestCustomOrganizationUserForm.
Some more tidying in forms_test, plus:
- use assertIn instead of assertTrue for testing if 'a in b' - get
  more descriptive message upon failure
- check that CustomOrganizationUserAddForm's is_editor value defaults as
  expected.
PEP-8 tidying.
Tidying of views_test plus:
- use assertIs instead of assertEqual for confirming identity of views
  class
- added TestCustomOrganizationUpdate to test new view
CustomOrganizationUpdate.