Merge origin/master

Conflicts:
	GCamas-web/src/main/java/cl/hblt/beans/AsignacionCamaBean.java