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

Conflicts:
	app/models/planet.rb
Merge branch 'master' of https://github.com/Datenbankpraktikum2013/MMOG