#1
Merge branch 'master' into joffrey

Conflicts:
	Sol_Edm/Prj_Edm/Frm_Eleve.Designer.vb