initial import
Merge branch 'master' of github.com:swarnendude/locator
initial import