tmp
Merge branch 'master' of https://github.com/cvm1337/chatprogramm.cll

Conflicts:
	src/chatprogramm/cll/gui/EventController.java
Merge branch 'master' of https://github.com/cvm1337/chatprogramm.cll