Merge branch 'prueba-2'

Conflicts:
AndroidManifest.xml