Merge pull request #276 from penguinho/master

Adding auto-detect for android and locator tester