bug from accu2014
delete method
Avoid resetting paste bin state if delete action is cancelled
Merge pull request #620 from stefk/res-manager-fix

Avoid resetting paste bin state if delete action is cancelled
Merge pull request #618 from easy-es/password-change

bug from accu2014