Merge branch 'master' into remove-debug-utils

osu.Game/Beatmaps/BeatmapManager.cs

@@ -363,7 +363,7 @@ namespace osu.Game.Beatmaps
             foreach (var name in reader.Filenames.Where(f => f.EndsWith(".osu")))
             {
                 using (var raw = reader.GetStream(name))
-                using (var ms = new MemoryStream()) //we need a memory stream so we can seek and shit
+                using (var ms = new MemoryStream()) //we need a memory stream so we can seek
                 using (var sr = new StreamReader(ms))
                 {
                     raw.CopyTo(ms);

osu.Game/Screens/Menu/Intro.cs

@@ -165,7 +165,7 @@ namespace osu.Game.Screens.Menu
 
             Scheduler.AddDelayed(this.Exit, fadeOutTime);
 
-            //don't want to fade out completely else we will stop running updates and shit will hit the fan.
+            //don't want to fade out completely else we will stop running updates.
             Game.FadeTo(0.01f, fadeOutTime);
 
             base.OnResuming(last);