added test and updated overides...
Merge branch 'master' of https://github.com/bsautermeister/de.htwg.seapal.core

Conflicts:
	src/main/java/de/htwg/seapal/database/impl/TripDatabase.java