actualizada cadena
Merge branch 'master' of https://github.com/rocapal/cursoAndroidURJC

Conflicts:
	2ndEdition/jose.fernandez.rosa/4-Mapas/res/values/strings.xml
Merge branch 'master' of https://github.com/rocapal/cursoAndroidURJC