grisage de la frise
Merge remote-tracking branch 'origin/master'

Conflicts:
	screenFreebusyRoom.js
suite grisage frise