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

Conflicts:
	app/models/player_setting.rb
	db/migrate/20130730101940_create_alliances.rb
	db/schema.rb