Added model and DB integration for highlighting. Fixed sample data generation
Merge branch 'master' of https://github.com/ProjectGroep1/project-joetz