petit save pour le fun
carousel added - need some tests with pictures
Merge branch 'master' into pic-carousel-on-flat

Conflicts:
	app/views/flats/edit.html.erb
Merge branch 'pic-carousel-on-flat'