Header changes
Merge remote-tracking branch 'origin/master'
Navigation change
Header and navigation changes
Header changes
Content and footer changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/themes/omega_esf_v2/css/layouts/blue/blue.layout.css
	src/themes/omega_esf_v2/css/layouts/blue/blue.layout.no-query.css
	src/themes/omega_esf_v2/css/omega-esf-v2.no-query.css
	src/themes/omega_esf_v2/css/omega-esf-v2.styles.css
	src/themes/omega_esf_v2/sass/base/_typography.scss
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/themes/omega_esf_v2/css/layouts/blue/blue.layout.css
	src/themes/omega_esf_v2/css/layouts/blue/blue.layout.no-query.css
	src/themes/omega_esf_v2/css/omega-esf-v2.no-query.css
	src/themes/omega_esf_v2/css/omega-esf-v2.styles.css
	src/themes/omega_esf_v2/sass/base/_typography.scss
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/themes/omega_esf_v2/css/layouts/blue/blue.layout.css
	src/themes/omega_esf_v2/css/layouts/blue/blue.layout.no-query.css
	src/themes/omega_esf_v2/css/omega-esf-v2.no-query.css
	src/themes/omega_esf_v2/css/omega-esf-v2.styles.css
	src/themes/omega_esf_v2/sass/base/_typography.scss
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/themes/omega_esf_v2/css/layouts/blue/blue.layout.css
	src/themes/omega_esf_v2/css/layouts/blue/blue.layout.no-query.css
	src/themes/omega_esf_v2/css/omega-esf-v2.no-query.css
	src/themes/omega_esf_v2/css/omega-esf-v2.styles.css
	src/themes/omega_esf_v2/sass/base/_typography.scss
Jokes and articles changes