updated for alica
Merge branch 'master' of ssh://barbuda.vs.eecs.uni-kassel.de/~/git-repos/supplementary
Merge branch 'master' of github.com:carpe-noctem-cassel/supplementary