[Issue #328] Reset button handler (in progress)
Merge branch 'master' of https://github.com/mozilla/collusion