Merge remote-tracking branch 'davidpodhola/master'

Conflicts:
	lib/Configs/web.acceptancetests.config
	lib/Configs/web.acceptancetests.windowsauth.config
	lib/Configs/web.dev.config
	lib/Test-databases/SqlCE/roadkill-acceptancetests.sdf
	packages/Microsoft.AspNet.Mvc.3.0.20105.1/lib/net40/System.Web.Mvc.xml
	packages/Microsoft.AspNet.Mvc.4.0.30506.0/lib/net40/System.Web.Mvc.xml
	packages/Microsoft.AspNet.Mvc.5.0.0/lib/net45/System.Web.Mvc.xml
	src/Roadkill.Core/Roadkill.Core.csproj
	src/Roadkill.Core/packages.config
	src/Roadkill.Site/Themes/Web.config
	src/Roadkill.Site/Views/Web.config
	src/Roadkill.Site/packages.config
	src/Roadkill.Site/web.config
	src/Roadkill.Tests/Roadkill.Tests.csproj
	src/Roadkill.Web/App_Data/roadkill.sqlite
	src/Roadkill.Web/Roadkill.Web.csproj