rm col1_content
combine element and div#element
rm col3_content (replace by sidebar)
rm content_wrapper (replace by main)
rm markup clearfixes
refactor footer
pep8
allow the navigation to break
replace instance header background by a scaling gradient
fix left/right padding
update print
layout in %
fix settings layout
fix instance header
fix instance nav
rm page_margins
Merge pull request #682 from xi/feature-480-refactor-grid

refactor grid
Fix broken main menu if unthemed
Merge commit '9acdb94' (develop) into geo

Conflicts:
	src/adhocracy/templates/template.html
Merge commit '477d051c59fc5a3eaf5162a870f877c93048de55' into geo

We mainly needed to resolve the merge of page_margins and page_wrapper
and the addition of page_wrapper in root.html (previously this only
existed in template.html; index_map inherits from root.html).

Conflicts:
	src/adhocracy/static_src/stylesheets/widgets/_header.scss
	src/adhocracy/templates/index.html