Merge branch 'nav-styles' into dev

Conflicts:
wp-content/themes/kcpl/style.css