Merge branch 'master' of https://github.com/7oi/whoopshop

Conflicts:
	Bordspil/Views/Game/Edit.cshtml