Merge branch 'master' of github.com:qriver/MessageExchange

Conflicts:
	MessageExchange/.classpath
Merge branch 'master' of github.com:qriver/MessageExchange