little change
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/infinity/prototyp/cubes/CubeMain.java