Merge pull request #23 from jvelasques/master

[CDE-173] - Updating cgg draw calls
Merge pull request #24 from jvelasques/master

[CDE-171] ExportPopupComponent will not render chart