web proj
Merge branch 'master' of https://github.com/pmpu/serverhouse

Conflicts:
	app/server/serverhouse_web/packages/Microsoft.AspNet.Razor.3.0.0/Microsoft.AspNet.Razor.3.0.0.nupkg
	app/server/serverhouse_web/packages/Microsoft.AspNet.WebPages.3.0.0/Microsoft.AspNet.WebPages.3.0.0.nupkg
	app/server/serverhouse_web/packages/Microsoft.Web.Infrastructure.1.0.0.0/Microsoft.Web.Infrastructure.1.0.0.0.nuspec
	app/server/serverhouse_web/serverhouse_web/serverhouse_web.csproj