Added support for enabling water, buildings, etc.
Merge branch 'master' of https://github.com/SGD-GPSGames/GPSGames.git

Conflicts:
	GPSGames&Server/Echo/src/edu/virginia/cs/sgd/gpsgames/PointPicker.java
Merge branch 'master' of https://github.com/SGD-GPSGames/GPSGames.git
Allows water and other stuff