Merge branch 'master' of https://github.com/kifj/stomp-test.git

Conflicts:
	src/test/java/x1/stomp/test/JsonHelperTest.java
Merge branch 'master' of https://github.com/kifj/stomp-test

Conflicts:
	pom.xml