?
Merge branch 'master' of github.com:EtienneMangino/bookbibi

Conflicts:
	app/views/flats/_search_form.html.erb