a bit of sweeping
Merge remote-tracking branch 'origin/master'
Removed test of lat/long conversion in viewDidLoad
Merge remote-tracking branch 'origin/master'