Merging local diff with ghost data

Merging local diff with ghost data incase there were some default
values on newly added objects that the remote is not aware of.

Simperium/SPChangeProcessor.m

@@ -289,8 +289,20 @@ - (BOOL)_processRemoteModifyWithKey:(NSString *)simperiumKey
         NSDictionary *diff      = change[CH_VALUE];
         NSError *theError       = nil;
 
+        NSDictionary *diffToApply = nil;
+
+        if (newlyAdded) {
+            NSMutableDictionary *currentDiff = [[bucket.differ diffFromDictionary:@{} toObject:object] mutableCopy];
+            if (currentDiff.count > 0) {
+                [currentDiff addEntriesFromDictionary:diff];
+                diffToApply = currentDiff;
+            }
+        }else{
+            diffToApply = diff;
+        }
+
         // Apply the diff to the ghost and store the new data in the object's ghost
-        if (![bucket.differ applyGhostDiffFromDictionary:diff toObject:object error:&theError]) {
+        if (![bucket.differ applyGhostDiffFromDictionary:diffToApply toObject:object error:&theError]) {
             SPLogError(@"Simperium error during applyGhostDiff: %@", theError.localizedDescription);
             if (error) {
                 *error = [NSError sp_errorWithDomain:NSStringFromClass([self class]) code:SPProcessorErrorsReceivedInvalidChange description:theError.description];