Merge branch 'master'
Internacionalizacion de boton filtrar
Merge branch 'Solfamidas' of
https://github.com/maiteyanguas/innova4b-daw-modulo7-empresaReparto.git
into Solfamidas

Conflicts:
	src/main/resources/messages/messages_es.properties
	src/main/resources/messages/messages_eu_ES.properties
Last fixed at devolver coche.
Merge branch 'Solfamidas' of github.com:maiteyanguas/innova4b-daw-modulo7-empresaReparto into Solfamidas
Merge branch 'master' into Solfamidas
Devolver el coche
Merge branch 'Solfamidas' of https://github.com/maiteyanguas/innova4b-daw-modulo7-empresaReparto.git into Solfamidas
Merge branch 'master' into Solfamidas

Conflicts:
	src/main/java/innova4b/empresaReparto/reserva/repository/ReservaDao.java
	src/main/resources/messages/messages_eu_ES.properties
Merge branch 'Solfamidas' of github.com:maiteyanguas/innova4b-daw-modulo7-empresaReparto into Solfamidas

Conflicts:
	src/main/resources/messages/messages_es.properties
	src/main/resources/messages/messages_eu_ES.properties
Cambio en maps.
Merge branch 'Solfamidas' of https://github.com/maiteyanguas/innova4b-daw-modulo7-empresaReparto.git into Solfamidas
Pagina de devolucion
Internacionalización pagina
Fixed isCarFreeBetweenDates query
Merge branch 'origin/Solfamidas'
Merge branch 'Solfamidas'

Conflicts:
	src/main/resources/messages/messages_es.properties
	src/main/resources/messages/messages_eu_ES.properties