gallery
Merge branch 'local' into staging

Conflicts:
	wp-content/themes/orphan-theme-v2/header.php