ClientActivity Part 2 cache stuff
Merge branch 'master' of https://github.com/wratner/Searchable-File-Encryption