konflikt
Merge branch 'master' of https://github.com/fhtw/20130918