Merge origin/master

Conflicts:
	src/main/java/org/mtop/controlador/ControladorRequisicion.java
	src/main/webapp/paginas/secretario/solicitud/crear.xhtml
Merge origin/master