Add Aspect to listWatchableVariables() command
Adds type of simulation event to uptate method
Merge branch 'development' into replay

Conflicts:
	src/main/java/org/geppetto/simulation/SimulationService.java