Set maximum width for content panel
Merge branch 'marc-editor-dev'

Conflicts:
	app/assets/stylesheets/muscat.scss