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

Conflicts:
	app/controllers/alliances_controller.rb
	db/schema.rb
	db/seeds.rb
merge
Merge branch 'master' of https://github.com/Datenbankpraktikum2013/MMOG
added alliance functionality