merged!TEST
Merge remote-tracking branch 'origin/master'

Conflicts:
	SemanticTeamProject/src/main/java/de/uni/mannheim/semantic/model/Person.java