update bookmarklet alerts
Merge branch 'master' into heroku-edition

* master:
  update bookmarklet alerts