mise en f
langues ecran orientation
Merge remote-tracking branch 'origin/master'
http en moins
Merge remote-tracking branch 'origin/master'

Conflicts:
	screenFreebusy.js