Merge origin/master

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