Merge branch 'hotfix/top-nav-sticky'
nav-issues
Merge branch 'develop'
fixed issues with nav menus
fixed-issue with menu sticky
Merge branch 'master' of github.com:shawnsandy/theme-starter

Conflicts:
	css/globals.less
	js/theme.js
	stylesheet.css