Se agrego los componentes adicionales para las entities de:
Gabinete, Hallazgos, MotivoInadecuada, TipoResultado, ResultadoImagen.
Merge remote-tracking branch 'angrychuy/master'

Conflicts:
	ExpedienteWeb/src/main/resources/import.sql
Merge remote-tracking branch 'angrychuy/master'
Merge remote-tracking branch 'angrychuy/master'
Se agrego el entity de SystemSettings con sus clases correspondientes y
se agrego un valor predeterminado en import.sql
Merge remote-tracking branch 'angrychuy/master'
Merge remote-tracking branch 'angrychuy/master'

Conflicts:
	ExpedienteWeb/src/main/webapp/pacientes/busqueda.xhtml
Merge remote-tracking branch 'angrychuy/master'
Merge branch 'selaTest'
Imported the correct RequestScope package.