Merge remote-tracking branch 'origin/Trunk' into Trunk

Conflicts:
	src/ca/qc/bdeb/P56/NSMMessengerServer/Modele/Authentificateur.java