pull merge conflict solved
Merge branch 'master' of github.com:ese-unibe-ch/ese2013-team4