Merge branch 'master' of https://github.com/samhuerzeler/fhnw-pfcs.git