Merge branch 'master' into sigmafinal

Conflicts:
	mac/grecromand.keylayout
Merge branch 'master' into sigmafinal
Merge branch 'master' into sigmafinal
sigma final avant retour ligne
Merge branch 'sigmafinal' into complet

Conflicts:
	mac/grecromand.keylayout