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

Conflicts:
	src/ca/qc/bdeb/P56/NSMMessenger/NSMMessenger.java
Merge remote-tracking branch 'origin/Trunk' into Trunk
Merge remote-tracking branch 'origin/Trunk' into Trunk
hue