various styling changes
Merge branch 'master' into styling_changes

Conflicts:
	app/views/configurations/show.html.erb
Merge branch 'styling_changes'