Gallery progress
Merge branch 'working' into gh-pages