Fixing failed merge... or triying it
Merge branch 'Solfamidas' into Solfamidas_gmaps

Conflicts:
	src/main/webapp/WEB-INF/pages/reserva/new.jsp
Merge branch 'Solfamidas' of github.com:maiteyanguas/innova4b-daw-modulo7-empresaReparto into Solfamidas