Fix main-content width depending on sidebar
Merge branch 'master' of https://github.com/SverigesRiksdag/intranetgui

Conflicts:
	dev/ui/js/main.js