added cancel to new and edit
Merge branch 'master' of github.com:nicolabe/appenings