Story 1609: CANFAR theme update.
Merge branch 'canfar_dev'