Gallery moved to CMS
Merge branch 'feature-gallery'