User can now have app find their current location
Merge remote-tracking branch 'origin/master'