a less misleading undo button, X
Merge branch 'master' into gh-pages, update js