greenmile
Merged 'develop'.

Conflicts:
	core/src/main/java/trafficsim/factories/EntityFactory.java