Adjust heading top/bottom margins
Merge branch 'develop' into fork/format-id-guide

Conflicts:
	app/assets/stylesheets/common.css.scss