android client
Merge branch 'master' of https://github.com/hacktm/Mobile-Find-My-Way
Merge branch 'master' of https://github.com/hacktm/Mobile-Find-My-Way