merge
Merge branch 'master' of https://github.com/SWT14W18/MDG-2000.git

Conflicts:
	src/test/java/de/tudresden/swt14ws18/MessageTest.java