slave test01
slave test02
slave test03
slave test04
master test04
Merge branch 'master' into clubplus-server-takersk

Conflicts:
	src/main/java/WordTest.java
master origin