Modified FileModel::addOrUpdateFile to avoid overwriting encrypted_key_hash
Merge branch 'master' of https://github.com/surbhishah/UnifiedCloud