Merge conflict change for pull request #16.

Genymotion implementation adn deviceModel separation into an interface. Also moved things from adb to new class asdk (android SDK).