cambios pacman
Merge branch 'master' of https://github.com/rocapal/cursoAndroidURJC

Conflicts:
	2ndEdition/jose.fernandez.rosa/4-Mapas/bin/classes/curso/android/mapas/R$string.class
	2ndEdition/jose.fernandez.rosa/4-Mapas/bin/classes/curso/android/mapas/R$style.class
	2ndEdition/jose.fernandez.rosa/4-Mapas/gen/curso/android/mapas/R.java
	2ndEdition/jose.fernandez.rosa/pac-man/bin/classes/bartbender/homeunix/pac_man/GameView$1.class
	2ndEdition/jose.fernandez.rosa/pac-man/bin/classes/bartbender/homeunix/pac_man/GameView.class
	2ndEdition/jose.fernandez.rosa/pac-man/bin/classes/bartbender/homeunix/pac_man/Pacman.class
	2ndEdition/jose.fernandez.rosa/pac-man/bin/classes/bartbender/homeunix/pac_man/Phantom$PhantomStyle.class
	2ndEdition/jose.fernandez.rosa/pac-man/bin/classes/bartbender/homeunix/pac_man/Phantom.class
	2ndEdition/jose.fernandez.rosa/pac-man/bin/classes/bartbender/homeunix/pac_man/Sprite.class
Actualizando 6-Servicios