moving constants around
playing around with new jms messaging
Merge remote-tracking branch 'origin/master' into dev