IMPORTANT: Format of all files with Resharper

NO functional changes. If you have problems merging your changes, merge/rebase on previous commit then merge this. Conflicts can easily be resolved (take yours if in doubt)
After that merge next commits

VocaluxeLib/Songs/CBaseNote.cs

@@ -49,7 +49,7 @@ namespace VocaluxeLib.Songs
         public int StartBeat { get; set; }
 
         /// <summary>
-        /// Last beat of this note. First valid beat for a note after that is at EndBeat+1
+        ///     Last beat of this note. First valid beat for a note after that is at EndBeat+1
         /// </summary>
         public int EndBeat
         {

VocaluxeLib/Songs/CLineBase.cs

@@ -80,7 +80,7 @@ namespace VocaluxeLib.Songs
 
         #region Methods
         /// <summary>
-        /// Find last note with StartBeat
+        ///     Find last note with StartBeat
         /// </summary>
         /// <param name="beat"></param>
         /// <returns>Note index of last note with StartBeat or -1 if all notes start after beat</returns>

VocaluxeLib/Songs/CSong.cs

@@ -134,21 +134,21 @@ namespace VocaluxeLib.Songs
         public readonly List<String> UnknownTags = new List<string>();
 
         /// <summary>
-        /// Start of the song in s (s in txt)
+        ///     Start of the song in s (s in txt)
         /// </summary>
         public float Start;
         /// <summary>
-        /// End of the song in s (ms in txt)
+        ///     End of the song in s (ms in txt)
         /// </summary>
         public float Finish;
 
         public float BPM = 1f;
         /// <summary>
-        /// Gap of the mp3 in s (ms in txt)
+        ///     Gap of the mp3 in s (ms in txt)
         /// </summary>
         public float Gap;
         /// <summary>
-        /// Gap of the video in s (s in txt)
+        ///     Gap of the video in s (s in txt)
         /// </summary>
         public float VideoGap;
 
@@ -194,7 +194,7 @@ namespace VocaluxeLib.Songs
         }
 
         /// <summary>
-        /// Returns true if the requested game mode is available
+        ///     Returns true if the requested game mode is available
         /// </summary>
         /// <param name="gameMode"></param>
         /// <returns>true if the requested game mode is available</returns>

VocaluxeLib/Songs/CSongLoader.cs

@@ -1,4 +1,21 @@
-using System;
+#region license
+// This file is part of Vocaluxe.
+// 
+// Vocaluxe is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// Vocaluxe is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
+#endregion
+
+using System;
 using System.IO;
 using System.Linq;
 using System.Text;
@@ -6,12 +23,12 @@ using System.Text;
 namespace VocaluxeLib.Songs
 {
     /// <summary>
-    /// Part of CSong that is required for note loading
+    ///     Part of CSong that is required for note loading
     /// </summary>
     public partial class CSong
     {
         /// <summary>
-        /// Factor the bpm given in the txt is multiplied with
+        ///     Factor the bpm given in the txt is multiplied with
         /// </summary>
         private const int _BPMFactor = 4;
 
@@ -54,7 +71,7 @@ namespace VocaluxeLib.Songs
             }
 
             /// <summary>
-            /// Logs a given message with file name and line#
+            ///     Logs a given message with file name and line#
             /// </summary>
             /// <param name="msg">Message</param>
             /// <param name="error">True prepends "Error: "; False prepends "Warning: "</param>
@@ -470,9 +487,9 @@ namespace VocaluxeLib.Songs
             private const int _MaxOverlapNoteCt = 3;
 
             /// <summary>
-            /// Read notes. First try to read notes normally (assume standard)<br/>
-            /// If there are more than _MaxZeroNoteCt with length &lt; 1,  try to read notes adding 1 to length<br/>
-            /// Then if there are more than _MaxOverlapNoteCt fallback to first version ignoring notes with length &lt; 1
+            ///     Read notes. First try to read notes normally (assume standard)<br />
+            ///     If there are more than _MaxZeroNoteCt with length &lt; 1,  try to read notes adding 1 to length<br />
+            ///     Then if there are more than _MaxOverlapNoteCt fallback to first version ignoring notes with length &lt; 1
             /// </summary>
             /// <param name="forceReload"></param>
             /// <returns></returns>

VocaluxeLib/Songs/CSongWriter.cs

@@ -1,4 +1,21 @@
-using System;
+#region license
+// This file is part of Vocaluxe.
+// 
+// Vocaluxe is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// Vocaluxe is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.IO;
 

VocaluxeLib/Songs/CVoice.cs

@@ -69,7 +69,7 @@ namespace VocaluxeLib.Songs
 
         #region Methods
         /// <summary>
-        /// Find last line with StartBeat
+        ///     Find last line with StartBeat
         /// </summary>
         /// <param name="beat"></param>
         /// <returns></returns>
@@ -128,7 +128,7 @@ namespace VocaluxeLib.Songs
             {
                 CSongLine prevLine = _Lines[insPos];
                 //We already have a line break here
-                if (prevLine.StartBeat == startBeat && (prevLine.NoteCount==0 || prevLine.FirstNoteBeat == startBeat))
+                if (prevLine.StartBeat == startBeat && (prevLine.NoteCount == 0 || prevLine.FirstNoteBeat == startBeat))
                     return false;
                 //Maybe we have to split the previous line
                 while (prevLine.NoteCount > 0 && prevLine.LastNote.StartBeat >= startBeat)