added setLocation()
Merge remote-tracking branch 'origin/master'
prints location as locale rather than gps coordinates