Merge pull request #293 from gavincornwell/master

MOBSDK-746: Favorites cache is mixing up favorite sites and favorite folders.