Rules update

-rules update when changed and a redeployment is no longer required
Merge remote-tracking branch 'origin/new_development' into new_development

Conflicts:
	nbproject/private/private.xml
	web/resources/js/simulation_controller.js