Added Granite Mountains

Let me know if they look too wonky
Combat Changes

Faster mobs, slightly more knockback from player weapons, faster charge
time for player weapons, removed two NPE crashes related to combat,
allowed players to attack through water
Merge branch 'master' into Mills's-Branch

Conflicts:
	BiomeGenGreek.java
	Greece.java
delicate merge #1
delicate merge #2