Eliminar directorio duplicado
Merge branch 'master' of https://github.com/adsw-upm/Android