Merge branch 'Solfamidas'
Added functionalities for "devolver" and "finalizar" urls
Merge branch 'Solfamidas_DevolverCocheJSP'
Merge branch 'Solfamidas_DevolverCoche' into Solfamidas_DevolverCocheJSP

Conflicts:
	src/main/java/innova4b/empresaReparto/reserva/web/ReservaController.java