last changes
Merge branch 'master' of https://github.com/mekonium/exchangetest

Conflicts:
	src/main/java/org/example/HelloWorldServer.java
	src/main/java/org/example/JavaClientExample1.java
	src/main/java/org/example/OrdersSimulator.java