Merge branch 'gh-pages'
improve colour partial's layout
Merge branch 'master' into gh-pages