improved layout
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2014-team8
Merge branch 'master' of github.com:ese-unibe-ch/ese2014-team8