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

Conflicts:
- New files added prior to Maven-Integration needed to be moved to the
correct folders as per the new file structure

- Corrected contents of BiomeIdEntry and BiomeIdListingConfig... [Might
not use]