Search Highlight
Merge branch 'dev' into jeddev

Conflicts:
	sites/all/themes/csc/css/style.css