fixes
Merge branch 'master' into content_as_panels

Conflicts:
	static/css/style.css
redesign panel border