Avancer formulaire sale_book
Merge branch 'master' of https://github.com/facenord-sud/collaide

Conflicts:
	db/schema.rb
rien
Merge remote-tracking branch 'origin/master'