Merge branch 'master' of https://github.com/alemaitour/Net-Ypareo into devaxel

Conflicts:
	src/netypareo/GUI/AccueilProf.java