Merge branch 'master' of git.bfh.ch:staff/due1/sed-hs15-srs-green