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

MediaBrowser.ServerApplication/MainStartup.cs

@@ -224,7 +224,7 @@ namespace MediaBrowser.ServerApplication
 
             if (!runService)
             {
-                ShowSplashScreen(_appHost.ApplicationVersion, initProgress, logManager.GetLogger("Splash"));
+                if (!options.ContainsOption("-nosplash")) ShowSplashScreen(_appHost.ApplicationVersion, initProgress, logManager.GetLogger("Splash"));
                 
                 // Not crazy about this but it's the only way to suppress ffmpeg crash dialog boxes
                 SetErrorMode(ErrorModes.SEM_FAILCRITICALERRORS | ErrorModes.SEM_NOALIGNMENTFAULTEXCEPT |