Fixed initializers/paperclip.rb
Merge branch 'master' of github.com:EtienneMangino/bookbibi
FB connect + modifs dans navbar avec liens sign in/out/fb
 premiere version du booking
Merge branch 'master' into make-a-booking

Conflicts:
	db/schema.rb
Merge pull request #4 from EtienneMangino/add-fb-connect

FB connect + modifs dans navbar avec liens sign in/out/fb
 mise a jour booking
Merge branch 'master' into make-a-booking

Conflicts:
	config/routes.rb
	db/schema.rb
Merge pull request #5 from EtienneMangino/make-a-booking

 premiere version du booking
Merge branch 'master' into manage-my-flats

Conflicts:
	config/routes.rb