some minor changes
Merge branch 'master' of github.com:ese-unibe-ch/ese2013-team4

  Please enter a commit message to explain why this merge is necessary,