color display
Merge remote-tracking branch 'daniel/colorDisplay' into Color