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

Conflicts:
	Bordspil/Models/RiskRepository.cs
Merge branch 'master' of https://github.com/7oi/whoopshop
Merge branch 'master' of https://github.com/7oi/whoopshop
Merge branch 'master' of https://github.com/7oi/whoopshop
Merge branch 'master' of https://github.com/7oi/whoopshop
Merge branch 'master' of https://github.com/7oi/whoopshop
Merge branch 'master' of https://github.com/7oi/whoopshop
Merge branch 'master' of https://github.com/7oi/whoopshop
Merge branch 'master' of https://github.com/7oi/whoopshop
Merge branch 'master' of https://github.com/7oi/whoopshop