update

might not work
Merge remote-tracking branch 'origin/new_development' into new_development

Conflicts:
	web/resources/js/simulation_controller.js