https://api.playfab.com/releaseNotes#160627

resolve merge conflicts

Author: pgilmorepf

PlayFabApiTest.js

@@ -165,7 +165,7 @@ var PlayFabApiTests = {
 
     /// <summary>
     /// CLIENT API
-    /// Try to deliberately register a character with an invalid email and password.
+    /// Try to deliberately register a user with an invalid email and password
     ///   Verify that errorDetails are populated correctly.
     /// </summary>
     InvalidRegistration: function (assert) {

PlayFabSDK/PlayFabAdminApi.js

@@ -18,7 +18,7 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         sessionTicket: null,
-        sdkVersion: "0.20.160613",
+        sdkVersion: "0.21.160627",
         buildIdentifier: "jbuild_0",
         productionServerUrl: ".playfabapi.com",
         logicServerUrl: null,
@@ -292,6 +292,12 @@ PlayFab.AdminApi = {
         PlayFab._internalSettings.ExecuteRequest(PlayFab._internalSettings.GetServerUrl() + "/Admin/GetTitleData", request, "X-SecretKey", PlayFab.settings.developerSecretKey, callback);
     },
 
+    GetTitleInternalData: function (request, callback) {
+        if (PlayFab.settings.developerSecretKey == null) throw "Must have PlayFab.settings.developerSecretKey set to call this method";
+
+        PlayFab._internalSettings.ExecuteRequest(PlayFab._internalSettings.GetServerUrl() + "/Admin/GetTitleInternalData", request, "X-SecretKey", PlayFab.settings.developerSecretKey, callback);
+    },
+
     ListVirtualCurrencyTypes: function (request, callback) {
         if (PlayFab.settings.developerSecretKey == null) throw "Must have PlayFab.settings.developerSecretKey set to call this method";
 
@@ -316,6 +322,12 @@ PlayFab.AdminApi = {
         PlayFab._internalSettings.ExecuteRequest(PlayFab._internalSettings.GetServerUrl() + "/Admin/SetTitleData", request, "X-SecretKey", PlayFab.settings.developerSecretKey, callback);
     },
 
+    SetTitleInternalData: function (request, callback) {
+        if (PlayFab.settings.developerSecretKey == null) throw "Must have PlayFab.settings.developerSecretKey set to call this method";
+
+        PlayFab._internalSettings.ExecuteRequest(PlayFab._internalSettings.GetServerUrl() + "/Admin/SetTitleInternalData", request, "X-SecretKey", PlayFab.settings.developerSecretKey, callback);
+    },
+
     SetupPushNotification: function (request, callback) {
         if (PlayFab.settings.developerSecretKey == null) throw "Must have PlayFab.settings.developerSecretKey set to call this method";
 

PlayFabSDK/PlayFabClientApi.js

@@ -18,7 +18,7 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         sessionTicket: null,
-        sdkVersion: "0.20.160613",
+        sdkVersion: "0.21.160627",
         buildIdentifier: "jbuild_0",
         productionServerUrl: ".playfabapi.com",
         logicServerUrl: null,

PlayFabSDK/PlayFabMatchmakerApi.js

@@ -18,7 +18,7 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         sessionTicket: null,
-        sdkVersion: "0.20.160613",
+        sdkVersion: "0.21.160627",
         buildIdentifier: "jbuild_0",
         productionServerUrl: ".playfabapi.com",
         logicServerUrl: null,

PlayFabSDK/PlayFabServerApi.js

@@ -18,7 +18,7 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         sessionTicket: null,
-        sdkVersion: "0.20.160613",
+        sdkVersion: "0.21.160627",
         buildIdentifier: "jbuild_0",
         productionServerUrl: ".playfabapi.com",
         logicServerUrl: null,