Mockup android cleaning

and other refactorings.

I think that after this pr we can finally start developing for the meAdventur Mockup 2 version.