kleine commit
conflict opgelost
Merge branch 'master' of https://github.com/Onomanatee/project_JOETZ into androidVakanties