conflict
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2014-team4
conflict solved