Style modifications to fix highlighted region
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	sites/all/themes/drupalrocks/css/custom/chris-custom.css