Prueba nacho
Merge branch 'master' of https://github.com/JRCCorp/nMaps

Conflicts:
	src/es/nervion/maps/activity/MainActivity.java