Jede menge umgebaut ...
Merge branch 'kopie_KeywordsInEvents' of https://github.com/mfiebrich/Datenkralle into kopie_KeywordsInEvents

Conflicts:
	src/database/DatabaseManager.java
	src/server/ServerControl.java