Merge branch 'master' of /home/enrique/Documentos/mx.gob.dif.sinaris with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	grails-app/controllers/mx/gob/dif/sinaris/PlantillaEstadisticaController.groovy
Catalogo de especiliades