Localization
Merge branch 'master' of https://github.com/Mindfly/uLocate