Fix header inclusions.
Add ColorDataSet objects to GUI.
Merge branch 'gitredo'