Merge origin/master

Conflicts:
	js/interface/adminGeo/VentanaGeosPruebas.js
	js/interface/adminGeo/vistaVehiculos.js
Merge origin/master
Merge origin/master

Conflicts:
	js/interface/adminGeo/VentanaGeosPruebas.js
	js/interface/adminGeo/vistaVehiculos.js
Merge origin/master
Server
Merge origin/master