Merge origin/master

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

Conflicts:
	src/main/java/org/mtop/controlador/ControladorVehiculo.java
	src/main/java/org/mtop/reporte/ReporteListas.java
	src/main/java/org/mtop/security/InitializeDatabase.java
	src/main/webapp/paginas/admin/vehiculo/crear.xhtml