Merge branch 'hotfix/facebookpixel' into production
holy crap I think I got it all'
'
comment about bootstrap
Merge branch 'feature/four'
make search default ALL possibilities
Merge branch 'hotfix/3.6.7'

Conflicts:
	config/initializers/version.rb