Merge origin/master

Conflicts:
	GCamas-ejb/src/main/java/cl/hblt/sessions/BussinessFacadeLocal.java
	GCamas-web/src/main/webapp/index.xhtml
Merge origin/master
Merge origin/master

Conflicts:
	GCamas-ejb/src/main/java/cl/hblt/sessions/BussinessFacadeLocal.java
	GCamas-web/src/main/webapp/index.xhtml