[Android] App almost finished
Merge remote-tracking branch 'origin/master' into Android_MapSmileSpacesActivity
Almost finished
Merge pull request #8 from pepibumur/Android_MapSmileSpacesActivity

Android map smile spaces activity