Added saving and loading of backup watch list, and some bug fixes in DB.
Fixed dead-lock in CombinedFolder, revisions not saved, and DB
insertOrUpdate exception.
Added recovery for backed-up files.