Merge origin/Trunk into Trunk

Conflicts:
	src/ca/qc/bdeb/P56/NSMMessengerServer/NSMServer.java
	test/TestConnection.java

caliss de merge a marde
Merge origin/Trunk into Trunk
Merge origin/Trunk into Trunk