improving behavior for Android (AppsGateImpl still not working properly with android)
Merge branch 'master' of https://github.com/cegerard/appsGate-server