final Version
Merge branch 'master' of https://github.com/patricklehmann/zhaw-software-engineering-parkuhr