WebConfig
Merge branch 'dev' of https://github.com/NuGet/NuGetGallery into dev
Merge branch 'dev' of https://github.com/NuGet/NuGetGallery into dev
Merge branch 'dev' of https://github.com/NuGet/NuGetGallery into dev
Disable functional tests conditionally
Revert changes to sln

Revert the changes added by Vs 2013 in sln file.
Fix broken project merges
Removing spurious reference to JQuery version 1.10.2 (which doesn't actually exist.)
Remove wadcfg file because it is a) unnecessary and b) seems to be breaking the build
Merge branch 'qa' into dev
Merge branch 'dev-start' into dev
Fix HandleQueuedPackageEditsJob to use ExecuteTask

Because some idiot made it so you have to execute tasks this way in order for logging to work. Who was that? Oh... right... me...
Merge pull request #1478 from NuGet/anurse/1463-fixloggingineditablemetadata

Fix #1463 by changing HandleQueuedPackageEditsJob to use ExecuteTask
Fixes #1469 - save button doesn't appear to always work. Also fixes some other issues such as flickering visible message about 'you are about to navigate away' and issue where dialog is still visible after being 'dismissed' when you use back button to return to the edit page.
Merge pull request #1439 from NuGet/bhuvak-FunctionalTests

Disable functional tests conditionally
Merge branch 'staging' into dev
Fix #1342 by applying RequireRemoteHttps attribute to Register action
Fix warnings: DatabaseName' hides inherited member 'NuGetGallery.Operations.DatabaseTaskBase.DatabaseName' by removing the hiding members.
And refix build warnings about DatabaseName. Old fix was warning-fixing by build-breaking.
using max-width and max-height for package icons to avoid distortion and blurry upscaled icons, replace 50px by 48px

Conflicts:
	src/NuGetGallery/Content/Site.css