zoom pan
Merge remote-tracking branch 'origin/master' into gamemap-zoom-pan

Conflicts:
	.gitignore
	test/core/src/com/test/systems/AssetsSystem.java
	test/core/src/com/test/systems/ScreenSystem.java
Merge branch 'gamemap-zoom-pan'

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