style search
Merge remote-tracking branch 'origin/master'

Conflicts:
	wp-content/themes/bootstrap/style.css
style search