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

Conflicts:
	app/assets/javascripts/document/documents.js.coffee
Merge branch 'master' of https://github.com/facenord-sud/collaide
Merge branch 'master' of https://github.com/facenord-sud/collaide
Merge branch 'master' of https://github.com/facenord-sud/collaide
Merge branch 'master' of https://github.com/facenord-sud/collaide
Merge branch 'master' of https://github.com/facenord-sud/collaide

Conflicts:
	app/assets/javascripts/document/documents.js.coffee
Corrigé l'endentation dans le textarea des sale_book
Corrigé l'endentation dans le textarea des sale_book
Merge branch 'master' of https://github.com/facenord-sud/collaide