Merge branch 'master' into gh-pages
background changed to ice texture
Merge branch 'master' into gh-pages