[Commit]
Merge remote-tracking branch 'origin/master'

Conflicts:
	EditeurAutomates/src/vue/ClicDroitEtat.java