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

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