removing dodgy test colours from header & footer
Merge branch 'development' into staging
merging dev changes back in