should work
integrated incidents and updated simulation
Merge remote-tracking branch 'origin/demonstrator-1july' into demonstrator-1july

Conflicts:
	models/pw_policy.py
	models/users.py
	sim/estimator_sklearn_tree.py
	sim/policy_precovery.py
	sim/simulation.py
	static/config/settings.py