Merge origin/master

Conflicts:
	SettlerCraft/src/main/java/com/settlercraft/util/Structures.java