Merge branch 'develop' of https://github.com/rdn32/econsensus into rdn32-develop
for https://github.com/aptivate/econsensus/pull/130

Conflicts:
    django/econsensus/publicweb/tests/factories.py
    django/econsensus/publicweb/tests/model_test.py
Added two other test cases to check that editing a trigger field causes
last_modified update, and editing a non-trigger field doesn't.
Renamed FIELDS to TRIGGER_FIELDS.
Merge branch 'rdn32-develop' into develop