Merge branch 'master' of https://github.com/wet-boew/wet-boew-wordpress

Conflicts:
	wet-boew4/header.php
update header.php