Merge branch 'master' into export-nested-props

Conflicts:
	Source/models/Data/DataSubset.js
glyphs to js
Merge remote-tracking branch 'origin/export' into export-nested-props

Conflicts:
	Source/models/Data/DataSubset.js
Merge remote-tracking branch 'origin/export' into export-nested-props
Access nested props
Merge branch 'export' into export-glyph
Export Glyphs - Formatting and escaped values.
Export Glyphs - Load glyphs after data is loaded.
Export Glyph - Add radius scale.
Export Glyph - Add widget-container CSS.
Merge remote-tracking branch 'origin/export-glyph' into export-nested-props
Generic glyph rendering function
Fix some id derps