Merge origin/master

Conflicts:
	web/Cliente_reservarVeiculo.jsp
Merge origin/master