removed explicit cancel button
Merge branch 'master' of github.com:CarlTour/CarlTour