Changed LocationListener
Delayed the activity so geolocation shows
Fixed merge conflict in GeoLocationTracker
Merge pull request #315 from cchan5/master

Delayed activities to allow GPS to find location