Merge branch 'gh-pages'
Fix remove button displayed in non-edit mode
Merge branch 'master' into gh-pages