Merge branch 'develop' into update-changeLog

Author: mediumTaj

Config.json.enc

@@ -32,18 +32,18 @@ public class Build
     #region Build Options
     public static bool IsBuilding
     {
-        get { return EditorPrefs.GetInt("IsBuilding") != 0; }
-        set { EditorPrefs.SetInt("IsBuilding", value ? 1 : 0); }
+        get { return EditorPrefs.GetInt(Application.productName + "IsBuilding") != 0; }
+        set { EditorPrefs.SetInt(Application.productName + "IsBuilding", value ? 1 : 0); }
     }
     public static BuildTarget BuildTarget
     {
-        get { return (BuildTarget)EditorPrefs.GetInt("BuildTarget"); }
-        set { EditorPrefs.SetInt("BuildTarget", (int)value); }
+        get { return (BuildTarget)EditorPrefs.GetInt(Application.productName + "BuildTarget"); }
+        set { EditorPrefs.SetInt(Application.productName + "BuildTarget", (int)value); }
     }
     public static BuildOptions BuildOptions
     {
-        get { return (BuildOptions)EditorPrefs.GetInt("BuildOptions"); }
-        set { EditorPrefs.SetInt("BuildOptions", (int)value); }
+        get { return (BuildOptions)EditorPrefs.GetInt(Application.productName + "BuildOptions"); }
+        set { EditorPrefs.SetInt(Application.productName + "BuildOptions", (int)value); }
     }
     #endregion
 

Config.json.enc.orig

@@ -54,8 +54,8 @@ private class ServiceSetup
                 URL ="https://console.ng.bluemix.net/catalog/text-to-speech/", ServiceID="TextToSpeechV1" },
             new ServiceSetup() { ServiceName = "Dialog", ServiceAPI = "dialog/api",
                 URL ="https://console.ng.bluemix.net/catalog/dialog/", ServiceID="DialogV1" },
-            new ServiceSetup() { ServiceName = "Language Translator", ServiceAPI = "language-translator/api",
-                URL ="https://console.ng.bluemix.net/catalog/language-translator/", ServiceID="LanguageTranslatorV1" },
+            new ServiceSetup() { ServiceName = "Language Translator", ServiceAPI = "language-translation/api",
+                URL ="https://console.ng.bluemix.net/catalog/services/language-translation/", ServiceID="LanguageTranslatorV1" },
             new ServiceSetup() { ServiceName = "Natural Language Classifier", ServiceAPI = "natural-language-classifier/api",
 				URL ="https://console.ng.bluemix.net/catalog/natural-language-classifier/", ServiceID="NaturalLanguageClassifierV1" }
         };

Scripts/Editor/Build.cs

@@ -62,7 +62,7 @@ public class LanguageTranslator : IWatsonService
         #endregion
 
         #region Private Data
-        private const string SERVICE_ID = "TranslateV1";
+        private const string SERVICE_ID = "LanguageTranslatorV1";
         private static fsSerializer sm_Serializer = new fsSerializer();
         #endregion