Added booleans isWater and isLand, in case we need them
Added a get and set for Map.java, still WIP
Merge remote-tracking branch 'upstream/master'

Conflicts:
	HelixIndustriesPokemonTowerDefenseV1/src/model/Tile.java
Tile/map updated