Merge branch 'master' of https://github.com/ese-unibe-ch/ese2013-team6
Merge branch 'master' of https://github.com/countschokula/ese2013-team6