Merge pull request #23 from roydude/v1-train

Fixed marketplace app.
Merge branch 'v1-train' of https://github.com/owdqa/OWD_TEST_TOOLKIT into v1-train
turn off geoloc for camera by default.