rien
new cover_thumb
Merge remote-tracking branch 'origin/master'

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