Merge origin/master

Conflicts:
	src/main/webapp/paginas/admin/listaUsuario.xhtml
Merge origin/master

Conflicts:
	src/main/java/org/mtop/controlador/ControladorKardex.java
	src/main/webapp/paginas/admin/kardex/crear.xhtml