Merge origin/master

Conflicts:
	internas/motorista/veiculo/js/lista.js
Merge origin/master