service refactoring
merged upstream with modifications
Location service more readable ready
Merge pull request #89 from herbatnik/master

LocationService refactored