fix cancel/came_from link in badge edit form
Merge pull request #859 from xi/feature-fixup-#831

fix cancel/came_from link in badge edit form