Refactoring changes propagation
Merge branch 'development' into replay

Conflicts:
	src/main/java/org/geppetto/frontend/GeppettoMessageInbound.java
	src/main/java/org/geppetto/frontend/GeppettoServletController.java
Merge pull request #52 from openworm/development

Development
Refactoring propagation
Merge branch 'replay' of https://github.com/openworm/org.geppetto.frontend into replay
Propagating refactoring to frontend
Merge remote-tracking branch 'origin/development' into replay

Conflicts:
	src/main/java/org/geppetto/frontend/GeppettoServletController.java
	src/main/webapp/js/GEPPETTO.js
	src/main/webapp/js/websocket-handlers/GEPPETTO.SimulationHandler.js
Merge remote-tracking branch 'origin/development' into replay
Propagating all errors to frontend
Ongoing refactoring
Merge remote-tracking branch 'origin/development' into replay

Conflicts:
	src/main/webapp/js/geppetto-objects/Simulation.js
	src/main/webapp/js/websocket-handlers/GEPPETTO.SimulationHandler.js
Fix post-refactoring
Updates to cope with new model, entities lighting up now working
Fix for getTime, removed timestep
Merge remote-tracking branch 'origin/development' into replay

Conflicts:
	src/main/webapp/js/GEPPETTO.js
Predefined simulations to point to the corresponding samples branch
Merge pull request #77 from openworm/replay

Merging replay branch