Merge pull request #255 from vivekshresta/develop

Changes to accommodate UserStorageQuota in StoragePreferences