Merge origin/master

Conflicts:
	src/main/java/org/mtop/controlador/ControladorKardex.java
	src/main/webapp/paginas/admin/kardex/crear.xhtml
	src/main/webapp/paginas/admin/vehiculo/estadodeubicacion/lista.xhtml
Merge origin/master

Conflicts:
	src/main/java/org/mtop/controlador/ControladorKardex.java
	src/main/webapp/paginas/admin/kardex/crear.xhtml
	src/main/webapp/paginas/admin/vehiculo/estadodeubicacion/lista.xhtml
Merge origin/master

Conflicts:
	src/main/java/org/mtop/controlador/ControladorKardex.java
	src/main/webapp/paginas/admin/kardex/crear.xhtml
	src/main/webapp/paginas/admin/vehiculo/estadodeubicacion/lista.xhtml
Merge origin/master

Conflicts:
	src/main/webapp/paginas/admin/bussinesentitytype/property.xhtml
	src/main/webapp/paginas/admin/vehiculo/crear.xhtml