box-shadows changed to colour-swatch7
changed box shadow of nav and text
Merge remote-tracking branch 'upstream/develop' into develop

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.