work with @EdwardBock on sidebars
update code to support the reuse grid
Merge branch 'master' into sidebars

Conflicts:
	core/templates/editor.html
	core/templates/main.css
	grid.install
	js/grid2.0.js
sidebars are working with js collision calculations
default structure css for sidebars
sidebar bugfix etc
fixed reuse bug for image box (#117)
last bugfixes before sidebar+master reunion
a few more bugfixes
last before merge