Cambios en actividad forense
Merge branch 'master' of https://github.com/sebasgott/MedicinaForense

Conflicts:
	res/values/strings.xml