final
Merge origin/master

Conflicts:
	src/main/java/pl/grzegorz2047/openguild2047/cuboidmanagement/CuboidStuff.java