add uml
Merge branch 'master' of https://github.com/MrJack91/MultiChannel.git

Conflicts:
	src/ch/zhaw/mima/MessageQueueImpl.java
blbb
Merge branch 'master' of https://github.com/MrJack91/MultiChannel.git

Conflicts:
	.gitignore
	src/ch/zhaw/mima/MessagingService.java
	src/ch/zhaw/mima/Ticker.java
	src/ch/zhaw/mima/message/AbstractMessageImpl.java