Merge remote-tracking branch 'upstream/master' into tournament-tools

osu.Desktop/Program.cs

@@ -32,6 +32,7 @@ namespace osu.Desktop
                     var importer = new ArchiveImportIPCChannel(host);
                     // Restore the cwd so relative paths given at the command line work correctly
                     Directory.SetCurrentDirectory(cwd);
+
                     foreach (var file in args)
                     {
                         Console.WriteLine(@"Importing {0}", file);
@@ -46,6 +47,7 @@ namespace osu.Desktop
                         default:
                             host.Run(new OsuGameDesktop(args));
                             break;
+
                         case "--tournament":
                             host.Run(new TournamentGame());
                             break;