Some xvsm adaptions and testing
Merge branch 'master' of https://github.com/beikov/SBC-TU

Conflicts:
	pom.xml
Merging
Merge branch 'master' of https://github.com/beikov/SBC-TU

Conflicts:
	pom.xml
	sbc-jms/pom.xml
	sbc-jms/src/main/java/at/ac/tuwien/sbc/jms/JmsConnector.java