Merge branch 'gh-pages'
limit skill slot
Merge branch 'master' into gh-pages