Merge branch 'master' of git.bfh.ch:/staff/goc4/2018bti7061