Fixed incorrect logic where properties that were not marked as [XmlElement], [XmlIgnore], or [XmlArray] were incorrectly being marked as child nodes instead of attributes.
Fixed errors due to merge