Merge Fail
Merge branch 'master' of https://github.com/jlvarela/SAGPro

Conflicts:
	SAGProWeb/src/java/managedbeans/ConsultarProduccionManagedBean.java
	SAGProWeb/web/calidad/consultarProduccion.xhtml