fix merge
update CHANGES.md
Document primitive exceptions
Tweak CHANGES.md
Fixed Uri resolving for resources to use toString(). Added dae file for test models.
Tweak result parameter.
Merge pull request #1788 from tfili/model-datauri

Fixed models to allow use of Data URIs for resources.
Fix whitespace.
Changes after review.
Merge remote-tracking branch 'origin/master' into referenceProperties
Fix Two Canvases example
Merge remote-tracking branch 'origin/master' into private
Merge master to refdoc-2
Merge branch 'refdoc-2' into refdoc-3
Merge branch 'refdoc-3' into refdoc-4
Add material support for DynamicPath

Replaced `color`, `outlineColor`, and `outlineWidth` in `DynamicPath` with a `material` property.
This allows data sources to use materials other than PolylineOutline for paths.  CZML is not impacted by this change and doesn't have this ability yet, that will be addressed in a future pull.
Merge remote-tracking branch 'origin/master' into polylineGlow

Conflicts:
	CHANGES.md
Cleanup after merge.
Changes after review.
Merge pull request #1782 from AnalyticalGraphicsInc/refdoc-2

Minor reference doc cleanup