Merge branch 'feature/squashed-migrations' into integration/normalize_acts_as_journalized

Conflicts:
	app/assets/stylesheets/default/application.css.erb