merge header.php
Merge branch 'master' of github.com:sw33tr/plasenet_woo_superstore

Conflicts:
	header.php
Merge branch 'master' of github.com:sw33tr/plasenet_woo_superstore