deleted some dead buttons, added links to some cancel buttons
Merge branch 'master' of github.com:ese-unibe-ch/ese2014-team8