statistics time used
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/common/Constants.java
	src/model/simulation/SolverMapGraph.java