Merge branch 'master' of https://github.com/DigohD/CR

Conflicts:
	src/com/cr/world/TileLayer.java
	src/com/cr/world/TileMap.java
	src/com/cr/world/tile/WaterTile.java