wrap aside and main into a common element
main colors
address complete
Merge remote-tracking branch 'origin/master' into design
Merge remote-tracking branch 'origin/design'

Conflicts:
	_layouts/default.html