Return and Remove from wishlist done, removes from gui/database/session
Merge remote-tracking branch 'origin/master'