Finished multi screening (Switching of the screens is now possible)
Merge branch 'origin/develop'

Conflicts:
	core/src/main/java/trafficsim/screens/SimulationScreen.java