fix for REV-526
add cancel link to favorite item note editing
Merge branch 'master' of https://github.com/sul-dlss/revs
try and avoid some double render errors
try and fix a false exception from squash
Merge branch 'master' of https://github.com/sul-dlss/revs
merge from latest