correction frise
stopper frise après 20heures
Merge remote-tracking branch 'origin/master'

Conflicts:
	screenFreebusyRoom.js