mockServer & Android workspace.
Merge branch 'master' of https://github.com/t0p0s/Amarula