Merge pull request #16 from Technicolour/master

Pull merge commits from master
Merge pull request #17 from verneroberts/master

visual tweaks and a few minor bugfixes
Merge pull request #23 from verneroberts/master

refactor
Merge pull request #26 from verneroberts/master

UI updates
Merge pull request #27 from verneroberts/master

added roundtable
Merge pull request #32 from verneroberts/master

couple of bug fixes and extra tweaks
Merge pull request #33 from verneroberts/master

bugs fixes, merlin guessing, game over summary
Merge pull request #48 from Technicolour/master

Pulling the latest changes from release branch to development
Merge pull request #50 from verneroberts/master

added missing function in game assistant
Added google auth and database context
Had to do some crappy things to get injection working somewhat on the accounts controller
Added logout route
Merge pull request #52 from verneroberts/master

lady of the lake should be working
Merge pull request #56 from verneroberts/master

lancelot (kindof) and simplebot
Merge pull request #59 from verneroberts/master

added trustbot
Merge pull request #60 from verneroberts/master

lancelot switching, cheat bot
Players can join games.
Merge branch 'master' into development

Conflicts:
	ResistanceOnline.Core.Test/SpecFlow/GameAssistant.cs
	ResistanceOnline.Core/Game.cs
	ResistanceOnline.Site/Controllers/GameController.cs
	ResistanceOnline.Site/ResistanceOnline.Site.csproj
	ResistanceOnline.Site/Views/Game/Game.cshtml
Removed query project as we probably wont use it.

Fixed up bindings so that it uses the correct dbcontext, probably still isn't set up 100% correctly but seems to work for me :D
Merge pull request #3 from Technicolour/development

Luke's auth changes