Arreglo las primary key de sintoma y tipo de sintoma
Merge branch 'master' of https://github.com/nestor-m/triage.git

Conflicts:
	grails-app/controllers/triage/SintomaController.groovy
	grails-app/domain/triage/TipoDeSintoma.groovy
	web-app/js/script.js