Bug fixes for trash and edit
Merge remote-tracking branch 'origin/master'