Did some GUI work and xvsm testing
Merge branch 'master' of https://github.com/beikov/SBC-TU

Conflicts:
	sbc-gui/src/main/java/at/ac/tuwien/sbc/ui/MainFrame.java