+ frmSignUp
Merge branch 'master' into base

Conflicts:
	src/projet/java/frmSignUp.java