Merge branch 'markus101'

Conflicts:
	NzbDrone.Core.Test/SeriesProviderTest.cs
	NzbDrone.Core/Providers/MediaFileProvider.cs
	NzbDrone.Core/Providers/SeriesProvider.cs

NzbDrone.Core/Repository/SceneNameMapping.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using SubSonic.SqlGeneration.Schema;
+
+namespace NzbDrone.Core.Repository
+{
+    public class SceneNameMapping
+    {
+        [SubSonicPrimaryKey]
+        public virtual string SceneCleanName { get; set; }
+
+        public virtual int SeriesId { get; set; }
+
+        public virtual string SceneName { get; set; }
+    }
+}