Merge branch 'develop'
Bumped django-organizations submodule version (from
61ba957f131a48e9bb701336ac23702079c08049 to
fa9740388517ddd7e5344f0044ac469ec116bf23to) get latest updates from
bennylope/django-organizations, including Philip's fix for
https://aptivate.kanbantool.com/boards/5986-econsensus#tasks-1257369
Merge pull request #104 from jogwen/django-organizations-update

Bumped django-organizations submodule version (from 61ba957f131a48e9bb701336ac23702079c08049 to fa9740388517ddd7e5344f0044ac469ec116bf23) to get latest updates from bennylope/django-organizations, including Philip's fix for https://aptivate.kanbantool.com
Stop hiding the Edit link and feedback counts on Discussion detail
screen.
Finished fixing Discussions.
Merge branch 'develop'
Add mercurial dependency for django-livesettings repo
Merge remote-tracking branch 'upstream/develop' into feedback-identifier
Merge remote-tracking branch 'upstream/master' into feedback-identifier