geo
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/src/main/java/com/codebits/codemichigan/michiganoutdoors/activities/MainActivity.java
for josh
Find local lakes and streams and land stuff
Fix app label
Merge pull request #27 from shekibobo/near-me-debugging

Near me debugging