Merge branch 'master' of https://Smeagolworms4@github.com/Smeagolworms4/CastleDefenders.git

Conflicts:
	src/minecraft/assets/castledefenders/buildings/mercenary4/infos.json
	src/minecraft/mods/castledefenders/common/ModCastleDefenders.java
	src/minecraft/mods/castledefenders/common/building/Building.java
	src/minecraft/mods/castledefenders/common/building/BuildingParser.java
	src/minecraft/mods/castledefenders/common/worldgenerator/WorldGeneratorByBuilding.java
	src/minecraft/mods/castledefenders/utils/ConfigLoader.java
Merge branch 'master' of https://Smeagolworms4@github.com/Smeagolworms4/CastleDefenders.git

Conflicts:
	src/minecraft/mods/castledefenders/ModCastleDefenders.java