Merge branch 'develop'
feedback and comments show username instead of firstname lastname
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'
fallback for comment identifier if no username
Add mercurial dependency for django-livesettings repo
Update .gitignore with .sqlite and econsensus.log
PEP8 Cleanup
Bugfix:  Saving changes to Decisions via admin screen raises exception
that an object with that primary key already exists. This is caused
by DecisionAdmin's save_model() method passing request.user to
obj.save(), where Decision.save() passes all parameters to
model.Model.save(), which expects its first argument to be force_insert,
so db engine tries to do an insert rather than an update, which explains
the surprising error message (see publicweb/admin.py,
publicweb/models.py and django/db/models/base.py).
DecisionAdmin.save_model was originally added as part of a fix for csv
export 2 years ago where at the time Decision.save() was expecting
author as the first parameter but not passing it to models.Model.save().
Decision.save() not longer expects author as first parameter, and a load
of code that used to be there 2 years ago is now gone, so it seems safe
to just delete DecisionAdmin's save_model method. Can now save
Decisions via admin screen.
https://aptivate.kanbantool.com/boards/5986-econsensus#tasks-1393515
Update Decision.editor for edits via admin screens too.
Drop all decision watchers on a Decision when it gets moved to a new
Organization.
Tidied up test_changing_decisions_org_drops_decisions_watchers.
Made test more thorough (and caught a bug - author of an old feedback
getting notified):
- make one of each type of change (decision update, new feedback,
  feedback update, new comment) before *and* after moving the decision to the
  new organization, checking that no-one from the old org gets notified
upon changing the decision in the new org.
- use a different user for each change so that at least one email
  notification should go out for each change (we often don't notify the
original author or the editor)
Ensure we delete the feedback's watchers for all of the Decision's
feedbacks. Also, added test highlighting the next level that needs
fixing - watchers for django comments!
Ensure that we delete the watchers for all comments, for all feedbacks
under the decision.
Tidied up test_changing_decisions_org_drops_decisions_watchers()
Tidy up, added comments.