added stopUpdatingLocation code, removed NSLogs
Merge remote-tracking branch 'origin/master' into master1