Apricot unknown file extension checking

Apricot/Apricot.vb

@@ -4,6 +4,8 @@ Imports System.Text
 Public Module Apricot
     Public template_cache As New Dictionary(Of String, String)()
     Public encodingType As Encoding = New UTF8Encoding(False)
+    Public knownExtensions() As String = {"txt", "md", "css", "ts", "js", "html", "htm", "php", "xml", "json", "csv", "lass", "sass"}
+    Private warnedExtensions = False
 
     'https://stackoverflow.com/a/3448307
     Public Function ReadAllText(ByVal path As String)
@@ -116,11 +118,30 @@ Public Module Apricot
         End If
     End Sub
 
-    Public Function Compile(ByVal pageHtml As String, ByVal filename As String, ByVal siteRoot As String, ByVal local As Boolean, ByVal worker As Object)
+    Public Function Compile(ByVal pageHtml As String, ByVal filename As String, ByVal siteRoot As String, ByVal local As Boolean, Optional ByVal worker As Object = Nothing)
         If local Then ' clear cache for previews
             template_cache.Clear()
         End If
 
+        If filename.Contains(".") And (Not filename.StartsWith(".")) Then ' if contains an extension and is not a dotfile
+            Dim ext As String() = filename.Split(".")
+            Dim extension = ext(ext.Length - 1)
+            Dim pass = False
+            For Each ex In knownExtensions
+                If extension = ex Then
+                    pass = True
+                End If
+            Next
+            If Not pass Then
+                If Not worker Is Nothing Then
+                    If MsgBox("The type of file " & filename & " is unknown. If this is an image or asset other than a Page, choose Cancel to skip processing it.", MsgBoxStyle.Exclamation + MsgBoxStyle.OkCancel, "Unknown Extension") = MsgBoxResult.Cancel Then
+                        Return False
+                    End If
+                End If
+                doLog("WARN: The type " & extension & " is unknown. If this is an image or asset other than a page, place it in Includes. Further warnings will be suppressed.", worker, 40)
+            End If
+        End If
+
         Dim log As String = ""
         Dim templates = Path.Combine(siteRoot, "templates\")
         Dim content = ""
@@ -268,6 +289,8 @@ Public Module Apricot
         Dim includes = Path.Combine(siteRoot, "includes\")
         Dim out = Path.Combine(siteRoot, "out\")
 
+        warnedExtensions = False
+
         For Each file In subdir.GetFiles(pattern, SearchOption.AllDirectories)
             Dim modifiedDate = file.LastWriteTime
             Dim rel = ReplaceFirst(file.FullName, input, "")
@@ -280,19 +303,24 @@ Public Module Apricot
             End While
             doLog("Rendering " & rel.Replace("\", "/"), worker, 0)
 
-            Dim output As ApricotOutput = Compile(ReadAllText(file.FullName), rel, ReplaceLast(templates, "\templates", ""), False, worker)
-            Dim html = output.HTML
-            Dim attribs = output.Attributes
+            Try
+                Dim output As ApricotOutput = Compile(ReadAllText(file.FullName), rel, ReplaceLast(templates, "\templates", ""), False, worker)
+                Dim html = output.HTML
+                Dim attribs = output.Attributes
 
-            If rel.EndsWith(".md") Then
-                rel = ReplaceLast(rel, ".md", ".html")
-            End If
+                If rel.EndsWith(".md") Then
+                    rel = ReplaceLast(rel, ".md", ".html")
+                End If
 
-            doLog("Saving file", worker, 100)
-            System.IO.Directory.CreateDirectory(System.IO.Path.GetDirectoryName(out & rel))
-            My.Computer.FileSystem.WriteAllText(Path.Combine(out, rel), html, False, encodingType)
-            Dim info As FileInfo = New FileInfo(Path.Combine(out, rel))
-            info.LastWriteTime = modifiedDate
+                doLog("Saving file", worker, 100)
+                System.IO.Directory.CreateDirectory(System.IO.Path.GetDirectoryName(out & rel))
+                My.Computer.FileSystem.WriteAllText(Path.Combine(out, rel), html, False, encodingType)
+                Dim info As FileInfo = New FileInfo(Path.Combine(out, rel))
+                info.LastWriteTime = modifiedDate
+            Catch ex As InvalidCastException
+                doLog("Skipped", worker, 100)
+            End Try
+
         Next
         'For Each sdir In subdir.GetDirectories
         'walkInputs(sdir, pattern, siteRoot, worker)

AutoSite/Main.resx

@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAG
-        GAAAAk1TRnQBSQFMAgEBBwEAASgBBAEoAQQBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+        GAAAAk1TRnQBSQFMAgEBBwEAATABBAEwAQQBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
         AwABIAMAAQEBAAEgBgABIBYAA/EB/wPxAf8D8QH/A/EB/wPxAf8D8QH/A/EB/wPxAf8D8QH/A/EB/wPx
         Af8D8QH/A/EB/wPxAf/IAAPxAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/
         AwAB/wMAAf8D8QH/yAAD8QH/AwAB/wPxAf8D8QH/A/EB/wPxAf8D8QH/A/EB/wPxAf8D8QH/A/EB/wPx
@@ -152,7 +152,7 @@
         A4UB/wPrAf8D6wH/A6cB/wMAAf8DAAH/A/YB/0QAA/EB/wPxAf8D8QX/A+oB/wOBAf8DAAH/AwAB/wOB
         Af8D6gX/A/EB/wPxAf8D8QH/CAAD9gH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/
         AwAB/wMAAf8D0AH/Az8BbAQAAxcBIAP2Af8D9gH/A/YB/wP2Af8D9gH/AwAB/wPJAf8DXQHwA1EBoAMX
-        ASADKgFAA1UBsANdAfADWgHAA0cBgFAAA/EB/wOGAf8DBgH/A4EB/wOGAf8DBgH/A7IB/wPxAf8UAAP2
+        ASADKgFAA1UBsANdAfADWgHAA0cBgFAAA/EB/wOGAf8DBQH/A4EB/wOGAf8DBQH/A7IB/wPxAf8UAAP2
         Af8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/A6cB/wNUAawcAAP2Af8DAAH/
         A8kB/wMqAUBsAAT/A+oB/wPdAf8DgQH/A5kB/wPdAf8D8QX/FAAD9gH/A/YB/wP2Af8D9gH/A/YB/wP2
         Af8D9gH/A/YB/wP2Af8D9gH/A/YB/wNeAd0DCwEPHAAD9gH/A/YB/wP2Af8DKgFAcAAE/wPxAf8DgQH/
@@ -585,7 +585,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD4
-        JgAAAk1TRnQBSQFMAgEBCgEAASgBBAEoAQQBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+        JgAAAk1TRnQBSQFMAgEBCgEAATABBAEwAQQBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
         AwABMAMAAQEBAAEgBgABMC0AAf8DAAH/AwAB/wMAAf8DAAH/JAADCgENAzYBWQNHAYIDWwHDA2AB3gNU
         AawDCgENAwoBDZgAA8wB/wPMAf8DzAH/A8wB/wMAEf8DzAH/A8wB/wPMAf8UAAMGAQgDWQH1Af8ByAHJ
         Af8DXwHzAdQBrAGdAv8CxwH/A18B4ANbAcMDWwHEAzIBUZQAJP8DAAX/A8wB/xAAAwoBDgNKAYkDfwH+
@@ -614,42 +614,42 @@
         AQUDAAEBHAADgSH/A8AB/wMAAf8DwAH/AwAB/xAAAYEBAAG2Af8CAAGSAf8CAAH6Af8CAAL/AgAB0QH/
         AgABpAH/AZgBAAGkAf8BmAEAAaQB/xwAA4Ep/wMAAf8DAAH/AwAB/wkAAYEBAAH/AQABkAEAAf8BAAGB
         AQAB/wNlAfQDWAG7AzoBYgMiATEDEAEWAwYBCAMBAQIDAAEBFAADgSH/A8AB/wMAAf8DwAH/AwAB/wgA
-        AYEBAAG2Af8CAAGFAf8CAAH0Af8CAAL/AgAB5gH/AYEBAgGBAf8BxQGoAQAB/wHGAoEC/wEAAv8BqQEA
+        AYEBAAG2Af8CAAGFAf8CAAH0Af8CAAL/AgAB5gH/AYEBAQGBAf8BxQGoAQAB/wHGAoEC/wEAAv8BqQEA
         Aa4B/xwAA4Ep/wMAAf8DAAH/AwAB/wkAAYEBAAH/AQABoAEAAf8BAAGrAQAB/wEAAYQBAAH/A0AB/QNg
         AdYDSAGEAyoBQAMXASADCgENAwMBBAMAAQEQAAOBIf8DwAH/AwAB/wPAAf8DAAH/BAABgQEAAbYB/wIA
         Ad8B/wIAAv8CAAHrAf8BhwEAAYEB/wH+AgAB/wH4AY4BAAH/AdIBygEAAf8B9QKBAv8BAAL/AZYBAAGi
         Af8cAAOBKf8DAAH/AwAB/wMAAf8JAAGBAQAB/wEAAaUBAAH/AQABtQEAAf8BAAGwAQAB/wEAAZUBAAH/
         AQABgQEAAf8DZAHxA1QBrgM1AVcDHwEtAw8BFAMFAQcDAQECDAADgSH/A8AB/wMAAf8DwAH/AwAB/wYA
-        Ad8B/wIAAfMB/wIAAeMB/wHwAgAC/wGAAQAC/wEGAQAB/wHrAZ8BAAH/Ab0BsQEAAf8B5AKBAf8B6gEA
+        Ad8B/wIAAfMB/wIAAeMB/wHwAgAC/wGAAQAC/wEFAQAB/wHrAZ8BAAH/Ab0BsQEAAf8B5AKBAf8B6gEA
         Av8BgQEAAY8B/wHWAZoBAAH/AdYBmgEAAf8B1gGaAQAB/wHWAZoBAAH/DAADgSn/AwAB/wMAAf8DAAH/
-        CQABgQEAAf8BAAGrAQAB/wEAAbsBAQH/AQABtQEAAf8BAAGwAQAB/wEAAaUBAAH/AQABgQEAAf8DXwH7
+        CQABgQEAAf8BAAGrAQAB/wEAAbsBAAH/AQABtQEAAf8BAAGwAQAB/wEAAaUBAAH/AQABgQEAAf8DXwH7
         A14BzgNEAXkDJwE7AxQBGwMHAQoDAQECCAADgSH/A8AB/wMAAf8DwAH/AwAB/wYAAdEB/wIAAe8B/wIA
-        AeEC/wGBAQAC/wGKAQAC/wGBAQAB/wHXAY0BAAH/AeEB2AEAAf8B0AEGAYEB/wGvAQAB4wH/AYEBAAGE
+        AeEC/wGBAQAC/wGKAQAC/wGBAQAB/wHXAY0BAAH/AeEB2AEAAf8B0AEFAYEB/wGvAQAB4wH/AYEBAAGE
         Af8B1gGaAQAC/wH9AQAC/wH2AQAB/wHWAZoBAAH/DAADgSn/AwAB/wMAAf8DAAH/CQABgQEAAf8BAAGw
-        AQMB/wEAAcIBgQH/AQABuwEBAf8BAAG1AQAB/wEAAbABAAH/AQABqQEAAf8BAAGIAQAB/wEAAYEBAAH/
+        AQIB/wEAAcIBgQH/AQABuwEAAf8BAAG1AQAB/wEAAbABAAH/AQABqQEAAf8BAAGIAQAB/wEAAYEBAAH/
         A2IB6QNRAZwDLAFEAxYBHgMHAQkIAAOBIf8DwAH/AwAB/wPAAf8DAAH/BgAB0AH/AgAB7wH/AgAB5AH/
-        AeMBhAEAAf8BhwGoAQAB/wEAAaEBAAH/AQABhQEAAf8BwAEAAZMB/wHiAQMB/AH/Af4BggL/AZoBAAGh
+        AeMBhAEAAf8BhwGoAQAB/wEAAaEBAAH/AQABhQEAAf8BwAEAAZMB/wHiAQIB/AH/Af4BggL/AZoBAAGh
         Af8B1gGaAQAB/wHKAa0BgQH/AacBgQEAAf8BmgGBAQAB/wwAA4Ep/wMAAf8DAAH/AwAB/wkAAYEBAAH/
-        AQABswEKAf8BAAHJAYEB/wEAAcIBgQH/AQABuwEBAf8BAAG1AQAB/wEAAbABAAH/AQABqQEAAf8BAAGb
+        AQABswEJAf8BAAHJAYEB/wEAAcIBgQH/AQABuwEAAf8BAAG1AQAB/wEAAbABAAH/AQABqQEAAf8BAAGb
         AQAB/wEAAYEBAAH/A2IB9gNUAasDKwFCAw0BEQgAA4Eh/wPAAf8DAAH/A8AB/wMAAf8GAAHPAf8CAAHv
         Af8CAAHjAf8BAAHJAQAB/wEAAfMBAAH/AQAB6AEAAf8BAAGYAQAB/wHRAZsB5gL/AdgC/wHaAbUBywH/
-        AQABiQEAAf8BAAGBAQAB/xgAA4Ep/wMAAf8DAAH/AwAB/wkAAYEBAAH/AQABswEKAf8BAAHMAYEB/wEA
-        AckBgQH/AQABwgGBAf8BAAG7AQEB/wEAAbUBAAH/AQABsAEAAf8BAAGkAQAB/wEAAYEBAAH/AysB/ANU
+        AQABiQEAAf8BAAGBAQAB/xgAA4Ep/wMAAf8DAAH/AwAB/wkAAYEBAAH/AQABswEJAf8BAAHMAYEB/wEA
+        AckBgQH/AQABwgGBAf8BAAG7AQAB/wEAAbUBAAH/AQABsAEAAf8BAAGkAQAB/wEAAYEBAAH/AysB/ANU
         Aa8DLAFDAw0BEggAA4Eh/wPAAf8DAAH/A8AB/wMAAf8GAAHRAf8CAAHxAf8CAAHfAf8BAAH8AQAB/wEA
-        Af8BAAH/AYEB/wEAAf8BAAHWAQAB/wEAAYEBsAH/AcIBogHDAf8BAAGUAQAB/wEAAf8BAAH/AYEBrgEG
+        Af8BAAH/AYEB/wEAAf8BAAHWAQAB/wEAAYEBsAH/AcIBogHDAf8BAAGUAQAB/wEAAf8BAAH/AYEBrgEF
         Af8YAAOBKf8DAAH/AwAB/wMAAf8JAAGBAQAB/wEAAbkBgQH/AQABzgGBAf8BAAHMAYEB/wEAAckBgQH/
-        AQABwgGBAf8BAAG7AQEB/wEAAaEBAAH/AQABgQEAAf8DZQH0A1YBsQMyAVEDGAEhAwcBCggAA4EZ/wMA
-        Af8DAAH/AwAB/wMAAf8DwAH/AwAB/wYAAdQB/wGBAQAB8AH/AQQBAAHhAf8BgQGsAYEB/wHCAekBkwH/
+        AQABwgGBAf8BAAG7AQAB/wEAAaEBAAH/AQABgQEAAf8DZQH0A1YBsQMyAVEDGAEhAwcBCggAA4EZ/wMA
+        Af8DAAH/AwAB/wMAAf8DwAH/AwAB/wYAAdQB/wGBAQAB8AH/AQMBAAHhAf8BgQGsAYEB/wHCAekBkwH/
         AYEBvAGeAf8BAAGpAd0B/wEAAYEB2wH/AQABgQEAAf8BAAH/AQAB/wGBAbMBgQH/HAADgR3/A4EB/wMA
         Af8DAAH/AwAB/wMAAf8DAAH/CQABgQEAAf8BAAG+AYEB/wEAAdUBgQH/AQABzgGBAf8BAAHMAYEB/wEA
         AckBgQH/AQABlAEAAf8DQAH9A2EB4QNMAZIDLAFEAxgBIQMIAQsDAgEDCAADgRn/A4EF/wMAAf8DwAH/
-        AwAB/wMAAf8EAAKBAdkB/wKBAfAB/wGBAYAB8wH/AYEBAAHoAf8CAAGwAf8BAAEIAeEB/wEAAcYC/wEA
+        AwAB/wMAAf8EAAKBAdkB/wKBAfAB/wGBAYAB8wH/AYEBAAHoAf8CAAGwAf8BAAEHAeEB/wEAAcYC/wEA
         AYsB5QH/AQABgQHbAf8BAAH/AQAB/wwAAYEBAAGBAf8QAAOBHf8DgQH/A8AB/wMAAf8DAAH/AwAB/wMA
         Af8JAAGBAQAB/wEAAcIBgQH/AQAB3AGBAf8BAAHVAYEB/wEAAbsBgQH/AQABgQEAAf8DXAH4A1sBxAM/
         AW0DJAE2AxMBGgMHAQkDAQECAwABAQgAA4EZ/wOBAf8DAAH/A8AB/wMAAf8DwAH/AwAB/wQAAoEB3gH/
-        AoEB5wH/AoEB1QH/AQoBAAHuAf8CAAH0Af8BAAGVAeIB/wEAAecC/wEAAaoB9AH/AQABgQHbAf8MAAG+
+        AoEB5wH/AoEB1QH/AQkBAAHuAf8CAAH0Af8BAAGVAeIB/wEAAecC/wEAAaoB9AH/AQABgQHbAf8MAAG+
         AQABtwL/AQAC/wG4AZABqQH/DAADgR3/A4EB/wMAAf8DwAH/AwAB/wMAAf8DAAH/CQABgQEAAf8BAAHJ
-        AYEB/wEGAeIBgQH/AQABqAEAAf8BAAGBAQAB/wNhAeYDTgGZAy8BSQMcAScDDQESAwQBBgMBAQIQAAOB
+        AYEB/wEFAeIBgQH/AQABqAEAAf8BAAGBAQAB/wNhAeYDTgGZAy8BSQMcAScDDQESAwQBBgMBAQIQAAOB
         Af8DgQH/A4EB/wOBAf8DgQH/A4EB/wOBAf8DAAH/A8AB/wMAAf8DwAH/AwAB/wMAAf8EAAKBAdsB/wKB
         AfUB/wGBAYgB+QH/AQABnwHwAf8BAAHVAe4B/wEAAfUB/AH/AQAB+gL/AQAByAHiAf8BAAGBAdsB/wgA
         AbUBAAGrAv8BAAL/AdwBgQHgAf8B2AGMAeMB/wwAA4EB/wOBAf8DgQH/A4EB/wOBAf8DgQH/A4EB/wOB
@@ -666,63 +666,63 @@
         AQABgQGcAf8BAAGBAZwB/wEAAYEBnAH/AQABgQGcAf8IAAHTArwB/wHsAegB4QH/AfQB9QHrAf8B6gHo
         AeAB/wHKAcUBvAH/AbUBrgGmAf8DgQH/A4EB/wOBAf8DgQH/A4EB/xQAAYEBrwHiAf8BAAGrAdUB/wEA
         AZkBwwH/AQABoQHIAf8BAAGkAckB/wEAAagBywH/AQABqwHNAf8BAAGuAc4B/wEAAbIB0AH/AQABtQHR
-        Af8BBgG5AdMB/wEJAbsB1AH/AYEBvwHWAf8DXQHXAzEBTwwAA4EB/wOBAf8DgQH/LQABjgG1Af8BAAGO
+        Af8BBQG5AdMB/wEIAbsB1AH/AYEBvwHWAf8DXQHXAzEBTwwAA4EB/wOBAf8DgQH/LQABjgG1Af8BAAGO
         AbUB/wEAAY4BtQH/AQABjgG1Af8BAAGOAbUB/wEAAY4BtQH/AQABjgG1Af8BAAGOAbUB/wEAAY4BtQH/
         AQABjgG1Af8BAAGOAbUB/wEAAY4BtQH/AQABjgG1Af8BAAGOAbUB/wEAAYEBnAH/BAAB0gGzAbIB/wH3
-        AfABygP/AdUD/wHZA/8B3QP/AeID/wHmA/8B6wP/Ae8D/wHzAf8DgQH/FAABCQGyAcwB/wEAAZoBxAH/
+        AfABygP/AdUD/wHZA/8B3QP/AeID/wHmA/8B6wP/Ae8D/wHzAf8DgQH/FAABCAGyAcwB/wEAAZoBxAH/
         AQABgQGlAf8BAAGBAaUB/wEAAYEBpQH/AQABgQGlAf8BAAGBAaUB/wEAAYEBpQH/AQABgQGlAf8BAAGB
         AaUB/wEAAYEBpQH/AQABgQGlAf8BAAGBAaUB/wMrAfwDMwFSCAABwAKBAf8ByQHKAcMB/wHJAcoBwwH/
         AckBygHDAf8DgQH/A4EB/wOBAf8DgQH/GQABngG9Af8BgQHLAv8BAAGOAbUB/wGcA/8BgQHXAv8BgQHX
         Av8BgQHXAv8BgQHXAv8BgQHXAv8BgQHXAv8BgQHXAv8BgQHXAv8BAAGyAd4B/wGcAfMC/wEAAY4BtQH/
         AQABgQGcAf8EAAHSAbMBsgH/AfcB8AHNAf8B+gHwAcUB/wH5Ae0BxAH/Af4B/AHdA/8B5QP/AeoD/wHu
-        A/8B8gP/AfYB/wOBAf8UAAEJAbIBzAH/AQABhAGuAf8BvwP/AbwD/wG6A/8BuAP/AbUD/wGzA/8BsAP/
+        A/8B8gP/AfYB/wOBAf8UAAEIAbIBzAH/AQABhAGuAf8BvwP/AbwD/wG6A/8BuAP/AbUD/wGzA/8BsAP/
         Aa4D/wGsA/8BqQP/AaYD/wNQAZ4DEAEWCAABwAKBAf8CxwG+Af8B8gHzAeYB/wHzAfQB6QH/AfMB9QHr
         Af8B9AH1AewB/wHJAcoBwwH/A78B/wOBAf8DgQH/EQABngG9Af8BgQHLAv8BAAGOAbUB/wGcA/8BgQHj
-        Av8BgQHjAv8BgQHjAv8BgQHjAv8BgQHjAv8BgQHjAv8BgQHjAv8BgQHfAv8BAgGyAd4B/wGcA/8BAAGO
+        Av8BgQHjAv8BgQHjAv8BgQHjAv8BgQHjAv8BgQHjAv8BgQHjAv8BgQHfAv8BAQGyAd4B/wGcA/8BAAGO
         AbUB/wEAAYEBnAH/BAAB0gGzAbIB/wH3AfAB0AH/AfoB8AHHAf8B+QHtAccB/wH6AfIB0wH/AfsB8wHZ
-        Af8B/gH9AeoD/wHwA/8B9QP/AfkB/wOBAf8DgQH/A4EB/wwAAQkBsgHMAf8BAAGBAaEB/wHLA/8ByQP/
-        AcYD/wG1AYEBAAH/Ac8BgQEBAf8BzQGBAQAB/wGDAYEBAAH/AQABmQHMAf8BtwP/AbUD/wGBAcwB3QH/
+        Af8B/gH9AeoD/wHwA/8B9QP/AfkB/wOBAf8DgQH/A4EB/wwAAQgBsgHMAf8BAAGBAaEB/wHLA/8ByQP/
+        AcYD/wG1AYEBAAH/Ac8BgQEAAf8BzQGBAQAB/wGDAYEBAAH/AQABmQHMAf8BtwP/AbUD/wGBAcwB3QH/
         AzgBXQMEAQUIAAHAAoEB/wLHAb4B/wHyAfMB5wH/A4EB/wK9AbsB/wH0AfYB7AH/AfcB+AHxAf8B+gH7
         AfcB/wL9AfsF/wOBAf8NAAGeAb0B/wGBAcsC/wEAAY4BtQH/AZwD/wGEAecC/wGEAecC/wGEAecC/wGE
-        AecC/wGEAecC/wGEAecC/wGEAecC/wGEAesC/wEKAbYB3gH/AaUB9wL/AQABjgG1Af8BAAGBAZwB/wQA
+        AecC/wGEAecC/wGEAecC/wGEAecC/wGEAesC/wEJAbYB3gH/AaUB9wL/AQABjgG1Af8BAAGBAZwB/wQA
         AdIBswGyAf8B9wHwAdIB/wH6AfIBzwH/AfoB8AHPAf8B+AHsAc0B/wHyAdgBtQH/AfcB5wHNAf8B0AG/
-        AbEB/wH5Ae0B3QH/AQABgQGVAf8CAAGBAf8CAAEFAf8BCgEHAYEB/wOBAf8IAAEJAbIBzAH/AQABgQGZ
-        Af8B2AP/AdUD/wGvAQUBAAH/AZoCAAH/AYEBCQEAAf8BnAIAAf8BrAECAQAB/wHDAYEBAAH/AQABmQHM
+        AbEB/wH5Ae0B3QH/AQABgQGVAf8CAAGBAf8CAAEEAf8BCQEGAYEB/wOBAf8IAAEIAbIBzAH/AQABgQGZ
+        Af8B2AP/AdUD/wGvAQQBAAH/AZoCAAH/AYEBCAEAAf8BnAIAAf8BrAEBAQAB/wHDAYEBAAH/AQABmQHM
         Af8BwQP/AYEBsgHMAf8DMgFQAwEBAggAAcACgQH/AscBvgH/AfIB9AHpAf8B8gH0AekB/wHyAfQB6QH/
         AfQB9gHsAf8B9wH4AfEB/wH6AfsB9wH/Av0B+wX/A4EB/w0AAZ4BvQH/AYEBywL/AQABjgG1Af8BnAP/
         AZQB+wL/AZQB+wL/AZQB+wL/AZQB+wL/AZQB+wL/AZQB+wL/AZQB+wL/AYwB8wL/AYEBvgHnAf8BnAP/
         AQABjgG1Af8BAAGBAZwB/wQAAdIBswGyAf8B9wHwAdQB/wH1AeEBuQH/AfMB2wGzAf8B9AHdAbkB/wH3
         AecBzAH/AdUB0AHGAf8BAAGBAaEB/wEAAYEBpwH/AQABtgHpAf8BAAGBAaYB/wEAAYEBmgH/AQABgQGb
-        Af8DgQH/CAABBQGwAcoB/wEAAYEBmQH/AeUD/wG4AYEBAAH/Aa4BBAEAAf8BuQGBAQAB/wEAAYEBAAH/
+        Af8DgQH/CAABBAGwAcoB/wEAAYEBmQH/AeUD/wG4AYEBAAH/Aa4BAwEAAf8BuQGBAQAB/wEAAYEBAAH/
         AZ0BgQEAAf8BqgIAAf8BlwIAAf8BqgGBAQAB/wEAAb0B3gH/AYEBsgHMAf8DMgFQAwEBAggAAcACgQH/
         AscBvgH/AfIB9AHoAf8DgQH/A4EB/wOBAf8DgQH/Ar0Buwn/A4EB/w0AAZ4BvQH/AYEB0wL/AQABjgG1
         Af8BnAP/AZwD/wGcA/8BnAP/AaUB9wL/AZwD/wGcA/8BnAP/AZwD/wGBAcsC/wGcA/8BAAGOAbUB/wEA
         AYEBnAH/BAAB0gGzAbIB/wH3AfAB2AH/Ae0ByAGYAf8B6QG9AYoB/wHyAdkBtgH/AfEB1QGyAf8BoQG9
         AdcB/wGBAb4B8gH/AQABsAHkAf8BAAG1AegB/wEAAacB2wH/AQABpQHZAf8BAAGcAcsB/wIAAYEB/wOB
         Af8FAAGpAccB/wEAAYEBmQH/AfAD/wG5AYEBAAH/AcwBgQEAAf8B1gGBAQAB/wEAAYwBAAH/AbcBgQEA
-        Af8BxQGBAQAB/wEJAYEBAAH/AoEBAAH/AQABrwHXAf8BgQGyAcwB/wMyAVADAQECCAABwAKBAf8CxwG+
+        Af8BxQGBAQAB/wEIAYEBAAH/AoEBAAH/AQABrwHXAf8BgQGyAcwB/wMyAVADAQECCAABwAKBAf8CxwG+
         Af8B8gHzAeYB/wHzAfQB6QH/AfIB9AHpAf8B9AH2AewB/wH3AfgB8QH/AfoB+wH3Af8C/QH7Bf8DgQH/
         DQABngG9Af8BgQHfAv8BAAGOAbUF/wH3AfsC/wH3AfsC/wH3AfsC/wH3AfsC/wH3AfsO/wGEAdcB9wH/
         AfcB+wL/AQABjgG1Af8BAAGBAZwB/wQAAdIBswGyAf8B9wHwAdoB/wH1AeEBvQH/AfMB2wG3Af8B9AHe
-        Ab8B/wH6AfAB3QH/AQABgQGqAf8BgQG+AfIB/wEEAbsB7gH/AYEBqwHPAf8BAAGBAaoB/wEAAYsBxgH/
+        Ab8B/wH6AfAB3QH/AQABgQGqAf8BgQG+AfIB/wEDAbsB7gH/AYEBqwHPAf8BAAGBAaoB/wEAAYsBxgH/
         AQABjgHEAf8BAAGBAaEB/wOBAf8FAAGiAcMB/wEAAYEBmQH/AfwB+wHyAf8BzAGBAQAB/wGfAYcBAAH/
         AeABlgEAAv8BmQEAAf8B+QGTAQAB/wGRAYEBAAH/AQABgQEAAf8BAAGBAQAB/wEAAbkB3AH/AYEBsgHM
         Af8DMgFQAwEBAggAAcACgQH/AscBvgH/AfIB8wHnAf8DgQH/A4EB/wOBAf8DgQH/Ar0Buwn/A4EB/w0A
         AZ4BvQH/AYQB6wL/AYQB5wL/AQABjgG1Af8BAAGOAbUB/wEAAY4BtQH/AQABjgG1Af8BAAGOAbUB/wEA
         AY4BtQH/AQABjgG1Af8BAAGOAbUB/wEAAY4BtQH/AQABjgG1Af8BAAGOAbUB/wEAAY4BtQH/CAAB0gGz
         AbIB/wH3AfAB3QP/AewD/wHvA/8B9AH/AfoB/QH4Af8BgQHQAfsB/wGBAcIB9QH/AYEBxwHxAf8DqgH/
-        AQQCgQH/AQABkQHKAf8BAAGeAdEB/wEAAawB1QH/CQABmgHAAf8BAAGBAZkF/wHdAYEBAAH/AQABugEA
+        AQMCgQH/AQABkQHKAf8BAAGeAdEB/wEAAawB1QH/CQABmgHAAf8BAAGBAZkF/wHdAYEBAAH/AQABugEA
         Af8BAAHKAYEB/wGTAdIBgQL/AbgBAAH/AfkBkwEAAf8BAAGEAQAB/wEAAYEBAAH/AYEB1gHrAf8BgQGy
         AcwB/wMyAVADAQECCAABwAKBAf8CxwG+Af8B8gH0AekB/wHyAfQB6QH/AfIB9AHpAf8B9AH2AewB/wH3
         AfgB8QH/AfoB+wH3Af8C/QH7Bf8DgQH/DQABngG9Af8BnAHzAv8BjAH3Av8BjAH3Av8BjAH3Av8BjAH3
         Av8BjAHzFv8BAAGBAaUB/xAAAdIBswGyAf8B9wHwAd8B/wH6AfAB2AH/AfkB7QHWAf8B+QHtAdoB/wH5
-        Ae0B3gH/Af4B/AH5Af8BAAGoAeEB/wGBAcUB8AH/A6oB/wEGAoEB/wEAAaYB2QH/AQYBmAG4Af8DgQH/
+        Ae0B3gH/Af4B/AH5Af8BAAGoAeEB/wGBAcUB8AH/A6oB/wEFAoEB/wEAAaYB2QH/AQUBmAG4Af8DgQH/
         CQABkwG8Af8BAAGBAZkF/wGBAcYBgQH/AQABzAGBAf8B9QHyAbMB/wHNAfQByQH/AcAB0gGBAf8B1wGc
         AQAB/wGBAYUBAAH/AoEBAAH/Af0D/wGBAbIBzAH/AzIBUAMBAQIIAAHAAoEB/wLHAb4B/wHyAfQB6AH/
         A4EB/wOBAf8DgQH/AbwBvQG6Af8B+QH6AfUB/wH9Af4B/QH/Af4B/wH+Af8DgQH/DQABngG9Bf8BnAP/
         AZwD/wGcA/8BnAf/AQABjgG1Af8BAAGOAbUB/wEAAY4BtQH/AQABjgG1Af8BAAGOAbUB/wEAAYEBpQH/
         EAAB0gGzAbIB/wH3AfAB4gP/AfID/wH2Af8B+wH1AesB/wH7AfMB6gH/Af4B/QH7Af8BsAHjAfkB/wGg
-        Ac0B4QH/AYkBhAGBAf8DgQH/AQQBpQHPAf8BBAGlAc8B/w0AAYwBuQH/AQABgQGZCf8BkQG+AQgB/wHV
+        Ac0B4QH/AYkBhAGBAf8DgQH/AQMBpQHPAf8BAwGlAc8B/w0AAYwBuQH/AQABgQGZCf8BkQG+AQcB/wHV
         AdoBgwH/AdsB6gGhAf8BAAHMAYEB/wHCAZwBAAH/AecBhQEACf8BgQGyAcwB/wMyAVADAQECCAABwAKB
         Af8CxwG+Af8B8gH0AekB/wHyAfQB6QH/AfIB9AHpAf8B8wH1AesB/wH2AfcB8QH/AfoB/AH4Af8B+wH8
         AfkB/wH+Af8B/gH/A4EB/xEAAZ4BvQ3/AfcB+wL/AQABngG9Af8oAAHTAbQBswH/AfcB8AHkAf8B+gHw
@@ -738,8 +738,8 @@
         AdkB/wEAAbIB2QH/AQABsgHZAf8BAAGyAdkB/wGBAbUB8gH/Ay4BSAMBAQIIAAHAAoEB/wHBAoEB/wHB
         AoEB/wOBAf8BgQGnAbkB/wKBAZQB/wHgAroB/wGBAZQBqgH/AbwBuAHBAf8BgQGEAZcB/wOBAf9UAAGb
         Ac8B1QH/BAABgQG/AckB/wQAAYEBswHBAf8EAAGBAbYBwwH/BAABgQGtAbgB/xgAA2IB7wNiAe8DYgHv
-        A2IB7wNiAe8DYgHvA2IB7wNiAe8DYgHvA2IB7wNiAe8DYgHvA1EBnBQAAYABpQHDAf8BAAGsAcIB/wEK
-        AYMBnwH/AQEBiwGhAf8BAAGsAcIB/wGBAYQBlwH/AQABrAHCAf8DgQH/AYEBigGgAf8QAAFCAU0BPgcA
+        A2IB7wNiAe8DYgHvA2IB7wNiAe8DYgHvA2IB7wNiAe8DYgHvA1EBnBQAAYABpQHDAf8BAAGsAcIB/wEJ
+        AYMBnwH/AQABiwGhAf8BAAGsAcIB/wGBAYQBlwH/AQABrAHCAf8DgQH/AYEBigGgAf8QAAFCAU0BPgcA
         AT4DAAEoAwABQAMAATADAAEBAQABAQUAAYABARYAA/8BAAH8AR8B8AEPBAABwAEDAeABBwQAAcABAwHA
         AQMEAAHAAQMBwAEBBAABwAEDAYABAQQAAcABAwGBAYAEAAHAAQMBgQHBBAABwAEDAYEBwAQAAcABAwGB
         AcAEAAHAAQMCwQQAAcABAwGAAQEEAAHAAQMBwAUAAcABAwHwAQEEAAHAAQcB4AEDBAABwAEPAfABBwQA