Merge branch 'master' of https://github.com/aptivate/econsensus
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
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
Manipulating users
Merge remote-tracking branch 'upstream/master'
Navigation change to user_list and fixing up user_list page
Re-applied Sarah's change
(https://github.com/aptivate/econsensus/commit/959c95bcfb458bc34084ea2e170c5ea31092e06c
- accidentally dropped during conflict resolution on this branch) to

Changed the control for adding a new org from being a sentence at bottom
of screen to being a link at top of screen (orginially done by Sarah in
959c95bc, but accidentally dropped during a conflict resolution on this
branch). Also altered the 'no orgs here' message to refer to new
location of the control, and added some extra detail and formatting to
make the text look more appealing. Tidied up the org list, fixing some
logic that was meant to indicate when the current user is the owner of an
org (but wasn't), and making this into a new section on the line which also
shows the option to delete the org.
Merge remote-tracking branch 'upstream/org_changes' into org_changes

Conflicts:
	django/econsensus/publicweb/templates/organizations/organization_list.html