BearThor commiting
Merge branch 'master' of https://github.com/GroupMayhem/Verk-2013

Conflicts:
	Game-Zone/Game-Zone/App_Data/aspnet-Game_Zone-20130510113730.mdf
	Game-Zone/Game-Zone/App_Data/aspnet-Game_Zone-20130510113730_log.ldf
	Game-Zone/Game-Zone/Web.config
Hellað