Page mon profil
Merge origin/Trunk into Trunk

Conflicts:
	NSMDatabase
	src/ca/qc/bdeb/P56/NSMMessenger/Application/NSMClient.java
	src/ca/qc/bdeb/P56/NSMMessenger/Controleur/NSMMessenger.java
	src/ca/qc/bdeb/P56/NSMMessengerCommunication/Communication.java