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

Conflicts:
	.gitignore
	src/netypareo/entity/Etudiant.java
	src/netypareo/entity/Prof.java