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

Conflicts:
	mx.gob.dif.sinaris-grailsPlugins.iml
	src/groovy/mx/gob/dif/sinaris/TipoFirmante.groovy