Android plugin changes
Merge branch 'master' of https://github.com/Cryslo/EMSRisicoStage