Merge origin/master

Conflicts:
	src/main/webapp/paginas/admin/profile/crearUsuario.xhtml
	src/main/webapp/paginas/secretario/partidaContabilidad/crear.xhtml
Merge origin/master

Conflicts:
	src/main/java/org/mtop/controlador/ControladorSolicitudReparacionMantenimiento.java
Merge origin/master

Conflicts:
	src/main/java/org/mtop/controlador/ControladorSolicitudReparacionMantenimiento.java
Merge origin/master
Merge origin/master

Conflicts:
	src/main/java/org/mtop/controlador/ControladorSolicitudReparacionMantenimiento.java
Merge origin/master

Conflicts:
	src/main/java/org/mtop/controlador/ControladorSolicitudReparacionMantenimiento.java
Merge origin/master

Conflicts:
	src/main/java/org/mtop/controlador/ControladorRequisicion.java
Merge origin/master

Conflicts:
	src/main/java/org/mtop/controlador/ControladorRequisicion.java