better booking
Merge pull request #11 from EtienneMangino/booking_optimisation

better booking
Merge branch 'master' into add-user-controller

Conflicts:
	app/views/bookings/_form.html.erb