Story 1609: Updated header and footer for jekyll includes.
Merge branch 'canfar_dev'