work on moving the statistics infrastructure to snapshot.java
Merge branch 'master' of github.com:gnogueras/id2210-vt13

Conflicts:
	common/src/main/java/common/simulation/scenarios/Scenario1.java