move encryption keys to trash bin
restore encryption keys from trash bin (development snapshot)
fixed some problems and broken code
restore fixed
added handling for share-keys
this works only with latest files_encryption branch up from 813641e6e86601cc73da0f00d8430da62e872180
delete and restore of versions and share-keys now works
fix restore of the same file name
Merge pull request #3156 from owncloud/trashbin_for_encryption_keys_against_master

Trashbin for encryption keys now against master