Bjarnthor´s commit
Merge branch 'master' of https://github.com/GroupMayhem/Verk-2013

Conflicts:
	Game zone/Game zone/App_Data/aspnet-Game_zone-20130508154637.mdf
	Game zone/Game zone/App_Data/aspnet-Game_zone-20130508154637_log.ldf
	Game zone/Game zone/Game zone.csproj
	Game zone/Game zone/packages.config
	Game zone/packages/Owin.1.0/Owin.1.0.nupkg