some fixes
Merge branch 'master' of https://github.com/MrJack91/MultiChannel

Conflicts:
	src/ch/zhaw/mima/gui/AbstractMessagingModule.java
	src/ch/zhaw/mima/gui/MailModule.java
	src/ch/zhaw/mima/gui/SmsModule.java