Merge origin/master

Conflicts:
	GCamas-web/src/main/java/cl/hblt/beans/PrevisionBean.java
	GCamas-web/src/main/webapp/WEB-INF/faces-config.xml
	GCamas-web/src/main/webapp/index.xhtml