See my bookings et manage my flats
Merge branch 'master' into see-my-bookings

Conflicts:
	app/assets/stylesheets/application.css.scss
	app/views/bookings/_form.html.erb
Merge pull request #13 from EtienneMangino/see-my-bookings

See my bookings et manage my flats