wrap content in panels
Merge branch 'master' into content_as_panels

Conflicts:
	static/css/style.css
redesign panel border
more remodeling
added pager option
Merge branch 'new_pager_pull' into content_as_panels

Conflicts:
	templates/includes/pagination.html