fixed merge conflict in
src\AddIns\DisplayBindings\WpfDesign\WpfDesign.XamlDom\Project\XamlProperty.cs
Original author: Tobias Gummesson
------------------------------------------------------------------------------------------------------------------------

The previous solution regarding XAML names expected all properties of type string named Name to represent a name in XAML namescope, and this caused trouble with types with a property named Name that did not represent a XAML name. In this case the value of the property tried to be registered as name to the namescope and this caused either the value to be occupied as name, or threw an exception if name already was taken or the value consisted of characters forbidden in XAML names causing the value to not be set at all.

To solve this the value of a Name property is only registered to namescope if the property represents a XAML name (defined by RuntimeNamePropertyAttribute).

Also added a Name property to XamlObject that always sets the name to x:Name attribute, but gets it from either x:Name or the property that represents the XAML name if it exists (both are valid places for name registration).

Fixed a bug in XamlParser where x:Name value was not registered in its namescope.

All other changes (for example changes in PropertyGrid/XamlDesignItem) was to support the Name fixes described above.
fixed merge conflict in: Sending in an empty string as namespaceURI when setting a value to an attribute that does not belong to a namespace, otherwise it will overwrite the value in another attribute with same name but in another namespace if it finds one.
original author: Tobias Gummesson
Fix conflicts after merge

Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/PropertyGrid/PropertyGrid.cs
	src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/WpfDesign.XamlDom.csproj
	src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlProperty.cs
 Remove Name from a Pasted Control when it exists in the NameScope