11/17/14

fix cart logo
Merge remote-tracking branch 'origin/master'

Conflicts:
	inc/header.php