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'
Only show Delete if owner, Edit if Admin in organization admin view
Merge remote-tracking branch 'upstream/master'
Django organizations version number updated, organization_detail only tests for owner
Merge pull request #119 from philmcmahon/only-owner-delete

Only show Delete if owner
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
Merge branch 'master' into develop