Editable rules

- rules are now editable and removable
Merge remote-tracking branch 'origin/new_development' into new_development

Conflicts:
	mason/com/bcis/ca/service/Simulation.java
	web/resources/js/simulation_controller.js