Merge branch 'xem' into 'master'

Conflicts:
	NzbDrone.Common/DiskProvider.cs
	NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/ImportFileFixture.cs
	NzbDrone.Core/Providers/DecisionEngine/CustomStartDateSpecification.cs
	NzbDrone.Core/Providers/DiskScanProvider.cs
	NzbDrone.Core/Providers/DownloadProvider.cs

NzbDrone.Core/Model/EpisodeParseResult.cs

@@ -46,6 +46,10 @@ namespace NzbDrone.Core.Model
 
         public string ReleaseGroup { get; set; }
 
+        public bool SceneSource { get; set; }
+
+        public IList<Episode> Episodes { get; set; } 
+
         public override string ToString()
         {
 

NzbDrone.Core/Model/Xem/XemResult.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace NzbDrone.Core.Model.Xem
+{
+    public class XemResult<T>
+    {
+        public string Result { get; set; }
+        public T Data { get; set; }
+        public string Message { get; set; }
+    }
+}

NzbDrone.Core/Model/Xem/XemSceneTvdbMapping.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace NzbDrone.Core.Model.Xem
+{
+    public class XemSceneTvdbMapping
+    {
+        public XemValues Scene { get; set; }
+        public XemValues Tvdb { get; set; }
+    }
+}

NzbDrone.Core/Model/Xem/XemValues.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace NzbDrone.Core.Model.Xem
+{
+    public class XemValues
+    {
+        public int Season { get; set; }
+        public int Episode { get; set; }
+        public int Absolute { get; set; }
+    }
+}