Merge POINTERINO
Merge branch 'master' of https://github.com/mholupka/OpenFoMT

Conflicts:
	src/fomt/base/world/World.java