add userid to cancel url
update changelog
update fix for pressing cancel button, add some tests
Merge pull request #3 from maartenkling/1.1.x

Add userid to cancel url