Merge branch 'dev14' into dev

Attempt to fix some world-salad created from shitty 'succesful' autoresolve merging

Conflicts:
	src/jas/common/GlobalSettings.java
	src/jas/common/config/EntityCategoryConfiguration.java
	src/jas/common/spawner/biome/group/BiomeGroupRegistry.java
	src/jas/common/spawner/creature/handler/LivingHandlerRegistry.java
	src/jas/common/spawner/creature/type/CreatureTypeRegistry.java
	src/main/java/jas/common/DefaultProps.java
	src/main/java/jas/common/spawner/creature/handler/LivingGroupRegistry.java
	src/main/java/jas/common/spawner/creature/handler/parsing/keys/KeyParserBiome.java