versao inicial para android
Android funcionando
Merge remote-tracking branch 'upstream/master'