update forge version
Merge branch 'master' of https://github.com/JohnEspenhahn/Civilization-Wars

Conflicts:
	com/hahn/CivWars/Blocks/BlockBridge.java
	com/hahn/CivWars/Blocks/BlockLayout.java
	com/hahn/CivWars/Blocks/base/BlockCustomStone.java
	com/hahn/CivWars/Blocks/base/BlockIronOreHidden.java
	com/hahn/CivWars/CivWars.java
	com/hahn/CivWars/EventHookClass.java
	com/hahn/CivWars/Items/ItemHammer.java
	com/hahn/CivWars/Props.java
	com/hahn/CivWars/client/BlockLayoutRenderer.java
	com/hahn/CivWars/entity/EntityAISlaveBuild.java
	com/hahn/CivWars/entity/EntityAISlaveMine.java
	com/hahn/CivWars/entity/EntityFamilyMember.java
	com/hahn/CivWars/entity/EntityMale.java
	com/hahn/CivWars/entity/EntitySlave.java
	com/hahn/CivWars/entity/EntityWoman.java
	com/hahn/CivWars/util/Civilization.java