Stats
Merge branch 'master' of https://github.com/spektrumprojekt/spektrum

Conflicts:
	message-api/src/main/java/de/spektrumprojekt/datamodel/identifiable/Identifiable.java
	message-api/src/main/java/de/spektrumprojekt/datamodel/message/TermFrequency.java