Merge branch 'sidebars-module'

Conflicts:
	sass/_config.scss
	sass/base.scss