Made app say 'Current Location' if using current location
Merge remote-tracking branch 'origin/master'