Merge branch 'master' into Static
Info structure changes
Merge branch 'master' into Static
Merge branch 'master' into Front-End

Conflicts:
	wp-content/themes/hb/info/info.php
Merge branch 'Front-End'