Merge branch 'refs/heads/dev'
Adds border top top of header
Merge branch 'refs/heads/master' into dev