Added more sprites, animations, bug fixes
Merge branch 'master' of https://github.com/zachdev/Java-Game

Conflicts:
	src/com/zachdev/game/Game.java
	src/com/zachdev/game/entity/mob/Enemy.java
	src/com/zachdev/game/entity/mob/Mob.java
	src/com/zachdev/game/entity/mob/Player.java
	src/com/zachdev/game/entity/vehicle/Vehicle.java
	src/com/zachdev/game/graphics/AnimatedSprite.java
	src/com/zachdev/game/graphics/Sprite.java
	src/com/zachdev/game/graphics/SpriteSheet.java
	src/com/zachdev/game/level/tile/WaterEdgeTile.java