Changing style.less back to how it was and editing header.less navigation font size to 18px.
Merge branch 'develop-local' into develop

* develop-local:
  Changing style.less back to how it was and editing header.less navigation font size to 18px.