Merge branch 'gh-pages' into classic
fixed z-ordering issue
Merge branch 'classic' into gh-pages