Mantenimientos de Joao
Merge branch 'master' of https://github.com/zerohours/tareamoviles

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
	src/sv/ues/fia/moviles/db/ControlBDTarea.java