Ensure that the comment preview form (which gets used when an
invalid comment is entered) looks more like the normal comment
submission form, in terms of what fields are shown. (Fix for
http://aptivate.kanbantool.com/boards/5986-econsensus#tasks-1222983)
When adding existing user to organization, use inviting user's
username (rather than their first and last name, which may not
be set) in notification email. Also remove sentence that didn't
make any sense in that context. (Fix for
http://aptivate.kanbantool.com/boards/5986-econsensus#tasks-1257223)
When a feedback is updated, redo the feedback rating counts. (Fix for
http://aptivate.kanbantool.com/boards/5986-econsensus#tasks-995535)
Explicitly make dates in fixture files UTC (fix for
https://aptivate.kanbantool.com/boards/5986-econsensus#tasks-1755727)
Allow multiple feedback forms to be open at once
(fix for https://aptivate.kanbantool.com/boards/5986-econsensus#tasks-1133869)
Merge remote-tracking branch 'origin/master' into develop

Conflicts:
	django/econsensus/local_settings.py.jenkins
	django/econsensus/settings.py
Merge branch 'upgrade_software' into develop

Conflicts:
	django/econsensus/urls.py
Enable use of flatpages app within econsensus. This allows pages
to be created from the admin interface.
Ensure bullet lists in flatpages show up as such
Add entry point for flatpages: if admin has created an "about"
flatpage then put a link to this at the bottom of all pages
Ensure Markdown is installed, as it is used to render flat pages
Provide link to _all_ top-level flatpages, not just "about"
Restyling of links to top-level flat pages
The default decision list to display for an organization is the
list of Discussions - have this defined in a single place (in
DecisionList.DEFAULT, as it happens)
Make "edit" link for decisions into a button
Colour-coordinate Decision edit button based on its status
Make Edit link for Feedback into a button. (Ditto for Comment link)
Merge in latest develop branch from Aptivate
Merge branch 'HEAD', remote branch 'main/develop' into develop
Stop processing emails if they are auto-replies (detecting for Aptivate
only)