Merge remote-tracking branch 'origin/water-animation' into water-animation

Conflicts:
	src/com/cr/engine/input/Input.java
	src/com/cr/states/AmountState.java
	src/com/cr/world/TileMap.java
	src/com/cr/world/tile/WaterTile.java