Ähnlichkeit und Kooperativität
Merge branch 'master' of https://github.com/sijakubo/wissensmanagement

Conflicts:
	src/main/java/main/Queries/ArticleQueries.java