up
Merge branch 'master' of https://github.com/adrienrouquet/cpe-tphautedispo.git
Merge branch 'master' of
https://github.com/adrienrouquet/cpe-tphautedispo.git

Conflicts:
	cpe-tphautedispo/src/manager/UserManager.java