Some code review
Merge branch 'dennis' of https://github.com/KITrokopter/API-Application into dennis