iterator1
Merge remote-tracking branch 'origin/master' into gamemap-it1

Conflicts:
	test/core/src/com/test/systems/ScreenSystem.java