Creacion de base
Merge remote-tracking branch 'Android/master'