CSS
Merge branch 'develop' of https://github.com/tshafer/orion into develop

Conflicts:
	app/assets/stylesheets/.sass-cache/0d7cc54dc50c8e6fb396b9ed1f0d3f0e3f0dd052/base.scssc
	app/assets/stylesheets/.sass-cache/0d7cc54dc50c8e6fb396b9ed1f0d3f0e3f0dd052/navigation.scssc
	app/assets/stylesheets/.sass-cache/0d7cc54dc50c8e6fb396b9ed1f0d3f0e3f0dd052/section.scssc