frame thumbnails
margin gallery
Merge branch 'master' into gh-pages