temporary commit to pull
Merge branch 'master' of https://github.com/ProjectGroep1/Joetz-Android-V2
fixes for presentation