Merge origin/Trunk into Trunk

Conflicts:
	src/ca/qc/bdeb/P56/NSMMessenger/NSMMessenger.java
Merge origin/Trunk into Trunk