select la bonne conference
Merge branch 'master' of https://github.com/gillesmasy/prospectManager

Conflicts:
	FormMain.cs