Merge origin/master

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