add 'Cancel' button
Merge branch 'master' into gh-pages
re-generated js and source maps