Merge origin/master

Conflicts:
	SettlerCraft/src/main/java/com/settlercraft/model/structure/Structure.java
	SettlerCraft/src/main/java/com/settlercraft/util/Builder.java