moved some code around to make it easier to demo
Merge branch 'master' of github.com:will-quast/android-location-demo