Merge branch 'hotfix/3.6.7' into production
custom blurb and logo on organization
bump
Merge branch 'hotfix/vonn'

Conflicts:
	Gemfile.lock
	config/initializers/version.rb
	db/schema.rb