Design Updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	templates/cShop/default_page.tpl.php
	templates/cShop/headercss/style.css