Merge remote-tracking branch 'origin/master' into Bruno

Conflicts:

	Selling/Selling.Site/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Selling/Selling.v11.suo