Merge remote-tracking branch 'origin/developer' into developer

Conflicts:
	MusicPlayer/MusicPlayer/MainForm.Designer.cs

MusicPlayer/MusicPlayer/MainForm.Designer.cs

@@ -846,7 +846,7 @@ namespace MusicPlayer
             this.NotifyMenuStripPreviousButton.Click += new System.EventHandler(this.NotifyMenuStripPreviousButton_Click);
             //
             // resetToolStripMenuItem
-            // 
+            //
             this.resetToolStripMenuItem.Name = "resetToolStripMenuItem";
             this.resetToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
             this.resetToolStripMenuItem.Text = "Reset";