Merge branch 'master'

Conflicts:
	Pods/Backendless.podspec
	SDK/backendlessAPI/backendlessAPI.xcodeproj/project.pbxproj
	SDK/ios/backendless/backendless.a
	SDK/lib/backendless/backendless.a
	SDK/osx/backendless/backendless.a
	SDK/tvos/backendless/backendless.a
	SDK/watchos/backendless/backendless.a

Author: Olha Danylova

CHANGELOG.md

@@ -1,5 +1,8 @@
 # RELEASE HISTORY
 
+## 5.1.8 October 23, 2018
+* DeviceRegistrationAdapter fixed to handle os and osVersion correctly
+
 ## 5.1.7 October 10, 2018
 * Socket.IO updated to v 13.3.1
 * isValidUserToken method fixed to hanle fault correctly when there is no internet connection

SDK/Podfile.lock

@@ -0,0 +1,20 @@
+PODS:
+  - Socket.IO-Client-Swift (13.3.1):
+    - Starscream (~> 3.0.2)
+  - Starscream (3.0.6)
+
+DEPENDENCIES:
+  - Socket.IO-Client-Swift
+
+SPEC REPOS:
+  https://github.com/cocoapods/specs.git:
+    - Socket.IO-Client-Swift
+    - Starscream
+
+SPEC CHECKSUMS:
+  Socket.IO-Client-Swift: 79f8f85fa44881838175a20f9bd2c32bef2c9d37
+  Starscream: ef3ece99d765eeccb67de105bfa143f929026cf5
+
+PODFILE CHECKSUM: 675cc991d5f2f8cb6bcd0ce2d67444ed1b8f2a74
+
+COCOAPODS: 1.6.0.beta.1

SDK/backendlessAPI/Classes/Persistence/PersistenceAdapter/DeviceRegistrationAdapter.m

@@ -70,7 +70,15 @@ -(DeviceRegistration *)adaptToDeviceRegistration:(NamedObject *)body {
 
     for (NSString *property in [bodyProperties allKeys]) {
         if (![property isEqualToString:@"channelName"]) {
-            [deviceRegistration setValue:[[bodyProperties valueForKey:property] defaultAdapt] forKey:property];
+            if ([property isEqualToString:@"operatingSystemName"]) {
+                [deviceRegistration setValue:[[bodyProperties valueForKey:property] defaultAdapt] forKey:@"os"];
+            }
+            else if ([property isEqualToString:@"operatingSystemVersion"]) {
+                [deviceRegistration setValue:[[bodyProperties valueForKey:property] defaultAdapt] forKey:@"osVersion"];
+            }
+            else {
+                [deviceRegistration setValue:[[bodyProperties valueForKey:property] defaultAdapt] forKey:property];
+            }
         }
     }
     NSString *channelName = [[bodyProperties valueForKey:@"channelName"] defaultAdapt];