Merge pull request #20 from 4f6f3b/master

Added Liopleurodon.
Merge pull request #21 from 4f6f3b/master

Updated textures, plesiosaur model, some changes to plesiosaur riding.
Merge pull request #22 from 4f6f3b/master

Updating to match 1.6.4 Build 6.3.
Added the updated structure generation
Updated the build settings
Merge branch 'master' of https://github.com/FossilsArcheologyRevival/FossilArcheology1.7

Conflicts:
	src/main/java/coolalias/structuregenapi/util/StructureGeneratorBase.java
	src/main/java/mods/fossil/gens/structure/academy/AcademyUtil.java
	src/main/java/mods/fossil/gens/structure/shipwreck/ShipWreck1.java
	src/main/java/mods/fossil/gens/structure/shipwreck/ShipWreckUtil.java