Add cancel button
Merge branch 'master' of github.com:trentlarson/BitActivate