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

Conflicts:
	db/schema.rb
	db/seeds.rb