LUN-1258: folders and files are now restorable
Merge branch 'master_pbs' into LUN-1258
LUN-1258: restore functionality for files/folders now available
* fix: when restoring folder, its files were not restored
LUN-1258: fixed infinite loop when restoring file
* added tests for file restoring
* SettingsOverride can now be used as function/class decorator
LUN-1258: added folder restore tests
* changed messages and method names a bit to be more explicit
* fix: don't allow user to submit restore multiple times.
LUN-1216: path to file/folder is displayed when searching
LUN-1216: path to files/folders will be shown in log entries
LUN-1214: images without extension will be uploaded as filer images
* this will work for png, jpeg and gif
LUN-1152: file content needs to be saved before changing location
LUN-1311: folder delete view will not hide trashed objects
LUN-1330: exclude trashed folders from dir listing
LUN-1310: fixed collision detection when extracting archive.
LUN-1257: new command to hard-delete old trashed files and folders.
Merge pull request #44 from pbs/LUN-1330

LUN-1330: exclude trashed folders from dir listing
Bump version instructed by bamboo
Merge pull request #46 from pbs/LUN-1310

LUN-1310: fixed collision detection when extracting archive.
Merge pull request #43 from pbs/LUN-1311

LUN-1311: folder delete view will not hide trashed objects