Remove web.config as it will keep what it is after setting up the environment. New settings will go to the include config file.
Merge branch 'develop' into glass.mapper.sc

Conflicts:
	src/DemoSitecore.Web/DemoSitecore.Web.csproj