feedback when adding a favorite, refs #817
Merge branch 'master' into integration