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

Conflicts:
	MessageExchange/.classpath