merge the mess
Merge branch 'master' of https://github.com/jdehlin/TwitterSandbox

Conflicts:
	Source/TwitterSandbox.Website/Models/Database/ModelGenerator.cs
	Source/TwitterSandbox.Website/TwitterSandbox.Website.csproj