merge show & edit
Merge branch 'master' into gh-pages
merge show & edit