Merge remote-tracking branch 'origin/master' into feature-biome-inheritance

Conflicts:
	common/src/main/java/com/khorn/terraincontrol/customobjects/bo2/BO2Settings.java
		-- Used my implementation because it was more analagous to the BO3 implementation
	common/src/main/java/com/khorn/terraincontrol/generator/resourcegens/Resource.java
		-- Using Master
Resource specific Inheritance determination

- Getting closer to working inheritance. Some funky `OutOfBounds`
Exceptions still...
-- Cyclical and Self reference detection
-- Production-ish log levels on logs.
So Close! with some code fixes and simplifications...

@TODO
- Some isAnalagous() functions aren't returning correctly from what i
can see...
- Resource inheritance is still buggy
- Fix Logs and Levels when everything is done
Biome Inheritance: It works!!

@TODO
- Fix Logs and Levels
- More efficient code even though it's already pretty fast...
- Use Equals() in isAnalagous()
Log/Comment Clean up and a little efficiency
Misfits: sepEration --> sepAration
Oops, these weren't supposed to be committed xD
Merge branch 'feature-biome-inheritance' of https://github.com/SimSonic/TerrainControl into feature-biome-inheritance
Merge branch 'feature-biome-inheritance' into features-merge

Conflicts:
	common/src/main/java/com/khorn/terraincontrol/customobjects/bo2/BO2Settings.java
	common/src/main/java/com/khorn/terraincontrol/generator/resourcegens/Resource.java