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

Conflicts:
	app/assets/javascripts/document/documents.js.coffee