test
Merge branch 'master' of https://github.com/treppenkind/MultiChannel.git
Merge branch 'master' of https://github.com/treppenkind/MultiChannel.git

Conflicts:
	src/main/java/ch/zhaw/multichannel/gui/CreateMessageDialog.java
Merge branch 'master' of https://github.com/treppenkind/MultiChannel.git