[BUG#22] Ahora se ven imagenes a pantalla completa
Merge remote-tracking branch 'origin/master'

Conflicts:
	mileemAndroid/AndroidManifest.xml

merge