mostly commenting
Merge branch 'master' of https://github.com/davelkan/whisperspot

Conflicts:
	app/src/main/java/com/example/davelkan/mapv2/MapsActivity.java