que sucede
Merge origin/master
Oscar B. Reportes
Oscar B. Reportes v2
Merge origin/master

Conflicts:
	GCamas-ejb/src/main/java/cl/hblt/sessions/BussinessFacade.java