testing
Merge branch 'master' of https://github.com/AlienRunner/AndroidServer.git
now working