Merge branch 'master' of https://github.com/fr4g3r/nd.karlsruhe.dhbw.wwi12b3.git