Mostrar Datos De la consulta en la Factura
Conflictos resultos

Signed-off-by: Fabian Sayay <fsayay@espol.edu.ec>
Merge branch 'master' of https://github.com/pittersdb/SWII_Grupo_A

Conflicts:
	Project/sysmedic/src/main/java/com/swii/sysmedic/Facades/ConsultaFacade.java
	Project/sysmedic/src/main/webapp/WEB-INF/faces-config.xml

Signed-off-by: Fabian Sayay <fsayay@espol.edu.ec>
Se permitio guardar las facturas considerando una sola unidad transaccional.
Merge branch 'master' of https://github.com/pittersdb/SWII_Grupo_A

Conflicts:
	Project/sysmedic/src/main/java/com/swii/sysmedic/Facades/MedicoFacade.java

Signed-off-by: Fabian Sayay <fsayay@espol.edu.ec>