cambios finales
Merge remote-tracking branch 'origin/edu2' into edu2

Conflicts:
	Applace/project.properties
	Applace/src/com/retni/applacegps/Fragment_mapa.java
Merge pull request #3 from eduardofernandezso/edu2

cambios finales