Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

MediaBrowser.Common.Implementations/BaseApplicationPaths.cs

@@ -295,7 +295,7 @@ namespace MediaBrowser.Common.Implementations
         {
             var programDataPath = _useDebugPath ? ConfigurationManager.AppSettings["DebugProgramDataPath"] : Path.Combine(ConfigurationManager.AppSettings["ReleaseProgramDataPath"], ConfigurationManager.AppSettings["ProgramDataFolderName"]);
 
-            programDataPath = programDataPath.Replace("%CommonApplicationData%", Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData));
+            programDataPath = programDataPath.Replace("%ApplicationData%", Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData));
 
             // If it's a relative path, e.g. "..\"
             if (!Path.IsPathRooted(programDataPath))

MediaBrowser.ServerApplication/App.config

@@ -11,7 +11,7 @@
   </nlog>
   <appSettings>
     <add key="DebugProgramDataPath" value="..\..\..\..\ProgramData-Server" />
-    <add key="ReleaseProgramDataPath" value="%CommonApplicationData%" />
+    <add key="ReleaseProgramDataPath" value="%ApplicationData%" />
     <add key="ProgramDataFolderName" value="MediaBrowser-Server" />
     <add key="ClientSettingsProvider.ServiceUri" value="" />
   </appSettings>