Test for new branch static
Merge branch 'master' into Static

Conflicts:
	wp-content/themes/hb/index.php
Restructured header and content
Merge branch 'Static'