Merge origin/master

Conflicts:
	src/java/classes/transacoes/Veiculos.java
Merge origin/master

Conflicts:
	web/Cliente_reservarVeiculo.jsp