before pull
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2013-team7
documentation folder reorganized, SRS finished
Merge branch 'master' of git://github.com/ese-unibe-ch/ese2013-team7