Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	ranked-api/src/main/scala/de/holisticon/ranked/api/model/Entity.scala
	ranked-impl/src/main/scala/de/holisticon/ranked/model/Dao.scala