commit to dillononly, not merged
prepare to merge
For merge to my branch
Merge branch 'dillononly' into dev

Conflicts:
	sites/all/themes/jjs/css/global.css
Modifying panels for use with Omega.