Merge branch 'master' into backend-init
Merge branch 'Static'
Merge branch 'master' into backend-init
Merge branch 'Static'
Merge branch 'Static'
Merge branch 'master' into backend-init
Merge branch 'master' of https://github.com/work-shop/hb
fixed image issue in head shots
Merge branch 'backend-init'
Merge branch 'Static'

Conflicts:
	wp-content/themes/hb/collaborations/collaboration-body.php
	wp-content/themes/hb/projects/project-body.php
Merge branch 'master' into Static
Info structure changes