MAJ suite aux remarques de Seb
Merge branch 'master' into add-user-controller

Conflicts:
	app/views/bookings/_form.html.erb
Merge pull request #10 from EtienneMangino/add-user-controller

MAJ suite aux remarques de Seb