Locus server and android-locus-client
Merge branch 'master' of https://github.com/hwangzhiming/Locus