prepared for new design
Merge branch 'master' of github.com:ese-unibe-ch/ese2013-team4
did stuff (a.k.a. stuff done)