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'
Now links to the discussions
Now redirects to discussions on login
Small adjustment to css to make user invite page less wonky
A quick and dirty fix for the cancel button
More verbose screen instructions, alterations to the organizations bit

Conflicts:

	django/econsensus/publicweb/templates/organizations/organization_detail.html
Renaming organizations redirects to org list now
Updated minor version number to reflect small changes made
Merge pull request #124 from yogiblue/org_changes

Org admin screen refactoring
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
Manipulating users
Navigation change to user_list and fixing up user_list page