Merge branch 'master' into develop
Merge branch 'hotfix/fix_sql_error_in_feedback' into develop
Merge branch 'hotfix/broke_something_when_trying_to_economise_showif' into develop
Merge branch 'hotfix/fix_reminder_sending' into develop
Merge branch 'master' into develop
list widget (without reordering)
change people_widget to text area which makes more sense
Merge branch 'develop' into feature/run_settings