'Merge' LocationService.java from test2 branch to master.
Merge branch 'master' of ssh://git@github.com/jonaslergell/takemethere.git