BPM-9
Merge branch 'master' of ssh://github.com/Benedikt1992/BPM