merge
solved conflict
Merge branch 'master' of https://github.com/Datenbankpraktikum2013/MMOG
Merge branch 'master' of https://github.com/Datenbankpraktikum2013/MMOG