issue #869 needs some styling
issue #869
Merge branch '869' into hotfixes
Merge branch 'hotfixes' into develop

Conflicts:
	oc-admin/themes/modern/css/main.css