Merge branch 'hotfix/facebookpixel' into production
make search default ALL possibilities
Merge branch 'hotfix/3.6.7' into production
Merge branch 'hotfix/3.6.7'

Conflicts:
	config/initializers/version.rb
custom blurb and logo on organization
bump
Merge branch 'hotfix/vonn'

Conflicts:
	Gemfile.lock
	config/initializers/version.rb
	db/schema.rb
Merge remote-tracking branch 'origin/master' into feature/spree

Conflicts:
	db/schema.rb