servicio de ordenes procesadasXanalista
Merge branch 'master' of https://github.com/luzarboleda25/SRC_SHFARMACIAS

Conflicts:
	java/com/seguroshorizonte/horifarmacia/sessionfacade/PreordenMedicamentoAnalistaFacade.java

	new file:   java/com/seguroshorizonte/horifarmacia/controller/AnalistaController.java
	new file:   java/com/seguroshorizonte/horifarmacia/controller/RegistroIngresoController.java
	new file:   java/com/seguroshorizonte/horifarmacia/controller/RolController.java
	new file:   java/com/seguroshorizonte/horifarmacia/controller/util/util/JsfUtil.java
	new file:   java/com/seguroshorizonte/horifarmacia/controller/util/util/PaginationHelper.java
	modified:   java/com/seguroshorizonte/horifarmacia/entidades/Analista.java
	modified:   java/com/seguroshorizonte/horifarmacia/entidades/ColaPreordenMedicamento.java
	new file:   java/com/seguroshorizonte/horifarmacia/entidades/RegistroIngreso.java
	modified:   java/com/seguroshorizonte/horifarmacia/sessionfacade/AnalistaFacade.java
	modified:   java/com/seguroshorizonte/horifarmacia/sessionfacade/ColaPreordenMedicamentoFacade.java
	modified:   java/com/seguroshorizonte/horifarmacia/sessionfacade/PreordenMedicamentoAnalistaFacade.java
	new file:   java/com/seguroshorizonte/horifarmacia/sessionfacade/RegistroIngresoFacade.java
	modified:   java/com/seguroshorizonte/horifarmacia/ws/Joseweb.java
	modified:   java/com/seguroshorizonte/horifarmacia/ws/WS_mari.java