mantenimiento categoria joao.
Merge branch 'master' of https://github.com/zerohours/tareamoviles

Conflicts:
	res/values/strings.xml
	src/sv/ues/fia/moviles/db/ControlBDTarea.java
Tablas de joao.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/sv/ues/fia/moviles/db/ControlBDTarea.java