some changes before meeting
little changes after talk
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2014-team4