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>
Nueva presentacion para la facturacion
arreglando conflictos en facturaFacade