Updated exception handler to ignore certain types of exceptions.

Fixed: All issues regarding Media Covers should be fixed now after apply this update. Refresh browser cache if still missing and report issues on forum.
Fixed: No longer leaves a corrupt file if MediaCover resize failed.
2026-03-25 17:35:35 -04:00 · 2015-02-07 15:22:49 +01:00 · 2015-02-06 22:38:37 +01:00 · 2015-02-04 07:31:24 -08:00
2466 changed files with 68134 additions and 110696 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,25 +0,0 @@
-# This file is for unifying the coding style for different editors and IDEs
-# editorconfig.org
-root = true
-
-[*.{cs,html,js,hbs}]
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-indent_style = space
-indent_size = 4
-
-[*.less]
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-indent_style = space
-indent_size = 2
-
-# They have troubles with TABS. Use 2 spaces
-[{package.json,.travis.yml}]
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-indent_style = space
-indent_size = 2
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,7 +0,0 @@
-
-
-
-Provide a description of the feature request or bug, the more details the better.
-When possible include a log!
-
-Please use our [Discord server](https://discord.gg/NWYch8M) for support or longer discussions.
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,14 +0,0 @@
-#### Database Migration
-YES | NO
-
-#### Description
-A few sentences describing the overall goals of the pull request's commits.
-
-#### Todos
- [ ] Tests
- [ ] Documentation
-
-
-#### Issues Fixed or Closed by this PR
-
-* 
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,6 @@ src/**/[Oo]bj/
 *.suo
 *.user
 *.sln.docstates
-.vs/

 # Build results
 *_i.c
@@ -42,9 +41,6 @@ src/**/[Oo]bj/
 _ReSharper*
 _dotCover*

-# DevExpress CodeRush
-src/.cr/
-
 # NCrunch
 *.ncrunch*
 .*crunch*.local.xml
@@ -101,7 +97,7 @@ App_Data/*.ldf
 _NCrunch_*
 _TeamCity*

-# Sonarr
+# NzbDrone
 config.xml
 nzbdrone.log*txt
 UpdateLogs/
@@ -109,7 +105,7 @@ UpdateLogs/
 *.test-cache
 *.userprefs
 */test-results/*
-src/UI/.idea/*
+.idea/*
 *log.txt
 node_modules/
 _output*
@@ -117,28 +113,12 @@ _rawPackage/
 _dotTrace*
 _tests/
 *.Result.xml
+wix/*.msi
+wix/*.wixobj
+wix/*.wixpdb
 setup/Output/
 *.~is

-UI.Phantom/
-
 #VS outout folders
 bin
 obj
-output/*
-
-#Packages
-Radarr_*/
-Radarr_*.zip
-Radarr_*.gz
-
-#OS X metadata files
-._*
-.DS_Store
-
-_start
-_temp_*/**/*
-
-#AppVeyor
-/tools-cake/
-/_artifacts/
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +0,0 @@
-[submodule "src/ExternalModules/CurlSharp"]
-	path = src/ExternalModules/CurlSharp
-	url = https://github.com/Sonarr/CurlSharp.git
-	branch = master
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +0,0 @@
-Sonarr
--- a/.idea/Sonarr.iml
+++ b/.idea/Sonarr.iml
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.idea" />
-      <excludeFolder url="file://$MODULE_DIR$/Logo" />
-      <excludeFolder url="file://$MODULE_DIR$/_output" />
-      <excludeFolder url="file://$MODULE_DIR$/_output_mono" />
-      <excludeFolder url="file://$MODULE_DIR$/_output_osx" />
-      <excludeFolder url="file://$MODULE_DIR$/_output_osx_app" />
-      <excludeFolder url="file://$MODULE_DIR$/_start" />
-      <excludeFolder url="file://$MODULE_DIR$/_tests" />
-      <excludeFolder url="file://$MODULE_DIR$/debian" />
-      <excludeFolder url="file://$MODULE_DIR$/node_modules" />
-      <excludeFolder url="file://$MODULE_DIR$/osx" />
-      <excludeFolder url="file://$MODULE_DIR$/schemas" />
-      <excludeFolder url="file://$MODULE_DIR$/setup" />
-      <excludeFolder url="file://$MODULE_DIR$/src" />
-      <excludeFolder url="file://$MODULE_DIR$/tools" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Sonarr node_modules" level="project" />
-  </component>
-</module>
--- a/.idea/codeStyleSettings.xml
+++ b/.idea/codeStyleSettings.xml
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <option name="LINE_SEPARATOR" value="&#13;&#10;" />
-        <option name="RIGHT_MARGIN" value="190" />
-        <option name="HTML_ATTRIBUTE_WRAP" value="0" />
-        <option name="HTML_KEEP_LINE_BREAKS" value="false" />
-        <option name="HTML_KEEP_BLANK_LINES" value="1" />
-        <option name="HTML_ALIGN_ATTRIBUTES" value="false" />
-        <option name="HTML_INLINE_ELEMENTS" value="" />
-        <option name="HTML_DONT_ADD_BREAKS_IF_INLINE_CONTENT" value="" />
-        <CssCodeStyleSettings>
-          <option name="HEX_COLOR_LOWER_CASE" value="true" />
-          <option name="HEX_COLOR_LONG_FORMAT" value="true" />
-          <option name="VALUE_ALIGNMENT" value="1" />
-        </CssCodeStyleSettings>
-        <JSCodeStyleSettings>
-          <option name="SPACE_BEFORE_PROPERTY_COLON" value="true" />
-          <option name="ALIGN_OBJECT_PROPERTIES" value="2" />
-          <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
-          <option name="OBJECT_LITERAL_WRAP" value="2" />
-          <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
-        </JSCodeStyleSettings>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-        <codeStyleSettings language="CSS">
-          <indentOptions>
-            <option name="SMART_TABS" value="true" />
-          </indentOptions>
-        </codeStyleSettings>
-        <codeStyleSettings language="JavaScript">
-          <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="true" />
-          <option name="KEEP_LINE_BREAKS" value="false" />
-          <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
-          <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
-          <option name="CATCH_ON_NEW_LINE" value="true" />
-          <option name="FINALLY_ON_NEW_LINE" value="true" />
-          <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
-          <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
-          <option name="SPACE_BEFORE_METHOD_PARENTHESES" value="true" />
-          <option name="CALL_PARAMETERS_WRAP" value="1" />
-          <option name="BINARY_OPERATION_WRAP" value="1" />
-          <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
-          <option name="ARRAY_INITIALIZER_WRAP" value="2" />
-          <option name="ARRAY_INITIALIZER_LBRACE_ON_NEXT_LINE" value="true" />
-          <option name="ARRAY_INITIALIZER_RBRACE_ON_NEXT_LINE" value="true" />
-          <option name="IF_BRACE_FORCE" value="3" />
-          <option name="DOWHILE_BRACE_FORCE" value="3" />
-          <option name="WHILE_BRACE_FORCE" value="3" />
-          <option name="FOR_BRACE_FORCE" value="3" />
-        </codeStyleSettings>
-      </value>
-    </option>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </component>
-</project>
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding">
-    <file url="PROJECT" charset="UTF-8" />
-  </component>
-</project>
--- a/.idea/jsLibraryMappings.xml
+++ b/.idea/jsLibraryMappings.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptLibraryMappings">
-    <includedPredefinedLibrary name="ECMAScript 6" />
-  </component>
-</project>
--- a/.idea/libraries/Sonarr_node_modules.xml
+++ b/.idea/libraries/Sonarr_node_modules.xml
@@ -1,14 +0,0 @@
-<component name="libraryTable">
-  <library name="Sonarr node_modules" type="javaScript">
-    <properties>
-      <option name="frameworkName" value="node_modules" />
-      <sourceFilesUrls>
-        <item url="file://$PROJECT_DIR$/node_modules" />
-      </sourceFilesUrls>
-    </properties>
-    <CLASSES>
-      <root url="file://$PROJECT_DIR$/node_modules" />
-    </CLASSES>
-    <SOURCES />
-  </library>
-</component>
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectRootManager" version="2" />
-</project>
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/Sonarr.iml" filepath="$PROJECT_DIR$/.idea/Sonarr.iml" />
-    </modules>
-  </component>
-</project>
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +0,0 @@
-language: csharp
-solution: src/NzbDrone.sln
-script:    # the following commands are just examples, use whatever your build process requires
-  - ./build.sh
-  - chmod +x test.sh
-#  - ./test.sh Linux Unit Takes far too long, maybe even crashes travis :/
-install:
-  - sudo apt-get install nodejs
-  - sudo apt-get install npm
-after_success:
-  - chmod +x package.sh
-  - ./package.sh
-notifications:
-  - webhooks: https://discordapp.com/api/webhooks/266910310219251712/V-QvCcnYkg3O8PMevcAJOJyCgrYkZQoF2pupLDGbaISNUECmYPd6LRwl3avKHsPyfgWP
--- a/7za.dll
+++ b/7za.dll
--- a/7za.exe
+++ b/7za.exe
--- a/7zxa.dll
+++ b/7zxa.dll
--- a/CLA.md
+++ b/CLA.md
@@ -1,6 +1,6 @@
-# Sonarr Individual Contributor License Agreement #
+# NzbDrone Individual Contributor License Agreement #

-Thank you for your interest in contributing to Sonarr ("We" or "Us").
+Thank you for your interest in contributing to NzbDrone ("We" or "Us").
 This contributor agreement ("Agreement") documents the rights granted by contributors to Us. To make this document effective, please complete the form below. This is a legally binding document, so please read it carefully before agreeing to it. The Agreement may cover more than one software project managed by Us.

 ## 1. Definitions ##
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,6 +1,6 @@
 # How to Contribute #

-We're always looking for people to help make Sonarr even better, there are a number of ways to contribute.
+We're always looking for people to help make NzbDrone even better, there are a number of ways to contribute. To get started, <a href="http://www.clahub.com/agreements/NzbDrone/NzbDrone">sign the Contributor License Agreement</a>.

 ## Documentation ##
 Setup guides, FAQ, the more information we have on the wiki the better.
@@ -8,24 +8,22 @@ Setup guides, FAQ, the more information we have on the wiki the better.
 ## Development ##

 ### Tools required ###
- Visual Studio 2015
- HTML/Javascript editor of choice (Sublime Text/Webstorm/Atom/etc)
+- Visual Studio 2013
+- HTML/Javascript editor of choice (Sublime Text/Webstorm/etc)
 - npm (node package manager)
 - git

 ### Getting started ###

-1.  Fork Sonarr
-2.  Clone (develop branch) *you may need pull in submodules separately if you client doesn't clone them automatically (CurlSharp)*
+1.  Fork NzbDrone 
+2.  Clone (develop branch)
 3.  Run `npm install`
-4.  Run `npm start` - Used to compile the UI components and copy them.
-    Leave this window open.
-    If you have gulp globally installed you can use `gulp watch` instead
+4.  Run `gulp watch` - Used to compile the UI components and copy them (leave this window open)
 5.  Compile in Visual Studio

 ### Contributing Code ###
- If you're adding a new, already requested feature, please comment on [Github Issues](https://github.com/Sonarr/Sonarr/issues "Github Issues") so work is not duplicated (If you want to add something not already on there, please talk to us first)
- Rebase from Sonarr's develop branch, don't merge
+- If you're adding a new, already requested feature, please comment on [Trello](https://trello.sonarr.tv "Trello") so work is not duplicated (If you want to add something not already on there, please talk to us first)
+- Rebase from NzbDrone's develop branch, don't merge
 - Make meaningful commits, or squash them
 - Feel free to make a pull request before work is complete, this will let us see where its at and make comments/suggest improvements
 - Reach out to us on the forums or on IRC if you have any questions
@@ -35,13 +33,8 @@ Setup guides, FAQ, the more information we have on the wiki the better.
 - Use 4 spaces instead of tabs, this is the default for VS 2012 and WebStorm (to my knowledge)

 ### Pull Requesting ###
- Only make pull requests to develop, never master, if you make a PR to master we'll comment on it and close it
 - You're probably going to get some comments or questions from us, they will be to ensure consistency and maintainability
 - We'll try to respond to pull requests as soon as possible, if its been a day or two, please reach out to us, we may have missed it
- Each PR should come from its own [feature branch](http://martinfowler.com/bliki/FeatureBranch.html) not develop in your fork, it should have a meaningful branch name (what is being added/fixed)
-  - new-feature (Good)
-  - fix-bug (Good)
-  - patch (Bad)
-  - develop (Bad)
+- Each PR comes from its own [feature branch](http://martinfowler.com/bliki/FeatureBranch.html) not develop in your fork

 If you have any questions about any of this, please let us know.
--- a/Log4ViewConfig.l4v
+++ b/Log4ViewConfig.l4v
@@ -0,0 +1,720 @@
+<Config xmlns:a="http://schemas.microsoft.com/2003/10/Serialization/Arrays" xmlns:b="http://schemas.datacontract.org/2004/07/System.Drawing" xmlns:d="http://schemas.datacontract.org/2004/07/Prosa.Log4View.Db" xmlns:f="http://schemas.datacontract.org/2004/07/Prosa.Log4View.Receiver.File" xmlns:l="http://schemas.datacontract.org/2004/07/Prosa.Log4View.Level" xmlns:m="http://schemas.datacontract.org/2004/07/Prosa.Log4View.Receiver.Msg" xmlns:n="http://schemas.datacontract.org/2004/07/Prosa.Log4View.Receiver.Net" xmlns:t="http://schemas.datacontract.org/2004/07/Prosa.Log4View.LoggerTree" xmlns:u="http://schemas.datacontract.org/2004/07/Prosa.Log4View.Utils" xmlns:i="http://www.w3.org/2001/XMLSchema-instance" z:Id="1" xmlns:z="http://schemas.microsoft.com/2003/10/Serialization/" xmlns="http://schemas.datacontract.org/2004/07/Prosa.Log4View.Configuration">
+  <Id>
+    <u:Value>1</u:Value>
+  </Id>
+  <Data z:Id="2">
+    <Id>
+      <u:Value>2</u:Value>
+    </Id>
+    <Version>17</Version>
+    <_receivers z:Id="3" z:Size="1">
+      <ReceiverConfig z:Id="4" i:type="n:NetReceiverConfig">
+        <Id>
+          <u:Value>16</u:Value>
+        </Id>
+        <BackColor>
+          <b:knownColor>0</b:knownColor>
+          <b:name i:nil="true" />
+          <b:state>2</b:state>
+          <b:value>4293654015</b:value>
+        </BackColor>
+        <BufferSize>500000</BufferSize>
+        <Encoding z:Id="5">Windows-1252</Encoding>
+        <LevelFilter z:Id="6" i:type="LogLevelSurrogated">
+          <LevelName z:Id="7">ALL</LevelName>
+        </LevelFilter>
+        <LoggingFrameworkId z:Id="8">Log4net</LoggingFrameworkId>
+        <Name z:Id="9">NzbDrone</Name>
+        <ParserType>XML</ParserType>
+        <ReadAdjacentMessages>0</ReadAdjacentMessages>
+        <ReadFrom>0001-01-01T00:00:00</ReadFrom>
+        <ReadUntil>0001-01-01T00:00:00</ReadUntil>
+        <SourceId>0</SourceId>
+        <TimeOffset>0</TimeOffset>
+        <TimeZone z:Id="10">Pacific Standard Time</TimeZone>
+        <UseFilter>false</UseFilter>
+        <Window>18</Window>
+        <n:HostName z:Id="11">localhost</n:HostName>
+        <n:Port>20480</n:Port>
+        <n:Protocol>Udp</n:Protocol>
+      </ReceiverConfig>
+    </_receivers>
+    <_sources z:Id="12" z:Size="0" />
+  </Data>
+  <Presentation z:Id="13">
+    <Id>
+      <u:Value>3</u:Value>
+    </Id>
+    <DefaultLogLevel z:Ref="6" i:nil="true" />
+    <ShowCodeDetails>false</ShowCodeDetails>
+    <ShowMessageDetails>true</ShowMessageDetails>
+    <ShowMultiField>true</ShowMultiField>
+    <ShowOutputOnDebug>true</ShowOutputOnDebug>
+    <ShowProcessDetails>false</ShowProcessDetails>
+    <ToolTipLogLevel z:Id="14" i:type="LogLevelSurrogated">
+      <LevelName z:Id="15">OFF</LevelName>
+    </ToolTipLogLevel>
+    <Version>17</Version>
+    <_charts z:Id="16" z:Size="0" />
+    <_columns z:Id="17" z:Size="29">
+      <ColumnConfig z:Id="18">
+        <Id>
+          <u:Value>78</u:Value>
+        </Id>
+        <ClipMode>ClipRight</ClipMode>
+        <FieldName z:Id="19">Id</FieldName>
+        <Name z:Ref="19" i:nil="true" />
+        <Position>-1</Position>
+        <Width>45</Width>
+        <WindowId>18</WindowId>
+      </ColumnConfig>
+      <ColumnConfig z:Id="20">
+        <Id>
+          <u:Value>79</u:Value>
+        </Id>
+        <ClipMode>ClipRight</ClipMode>
+        <FieldName z:Id="21">OriginalTime</FieldName>
+        <Name z:Ref="21" i:nil="true" />
+        <Position>-1</Position>
+        <Width>120</Width>
+        <WindowId>18</WindowId>
+      </ColumnConfig>
+      <ColumnConfig z:Id="22">
+        <Id>
+          <u:Value>80</u:Value>
+        </Id>
+        <ClipMode>ClipRight</ClipMode>
+        <FieldName z:Id="23">Time</FieldName>
+        <Name z:Ref="23" i:nil="true" />
+        <Position>1</Position>
+        <Width>80</Width>
+        <WindowId>18</WindowId>
+      </ColumnConfig>
+      <ColumnConfig z:Id="24">
+        <Id>
+          <u:Value>81</u:Value>
+        </Id>
+        <ClipMode>ClipRight</ClipMode>
+        <FieldName z:Id="25">LocalTime</FieldName>
+        <Name z:Ref="25" i:nil="true" />
+        <Position>-1</Position>
+        <Width>120</Width>
+        <WindowId>18</WindowId>
+      </ColumnConfig>
+      <ColumnConfig z:Id="26">
+        <Id>
+          <u:Value>82</u:Value>
+        </Id>
+        <ClipMode>ClipRight</ClipMode>
+        <FieldName z:Id="27">UtcTime</FieldName>
+        <Name z:Ref="27" i:nil="true" />
+        <Position>-1</Position>
+        <Width>120</Width>
+        <WindowId>18</WindowId>
+      </ColumnConfig>
+      <ColumnConfig z:Id="28">
+        <Id>
+          <u:Value>83</u:Value>
+        </Id>
+        <ClipMode>ClipRight</ClipMode>
+        <FieldName z:Id="29">Date</FieldName>
+        <Name z:Ref="29" i:nil="true" />
+        <Position>-1</Position>
+        <Width>70</Width>
+        <WindowId>18</WindowId>
+      </ColumnConfig>
+      <ColumnConfig z:Id="30">
+        <Id>
+          <u:Value>84</u:Value>
+        </Id>
+        <ClipMode>ClipRight</ClipMode>
+        <FieldName z:Id="31">Key</FieldName>
+        <Name z:Ref="31" i:nil="true" />
+        <Position>-1</Position>
+        <Width>120</Width>
+        <WindowId>18</WindowId>
+      </ColumnConfig>
+      <ColumnConfig z:Id="32">
+        <Id>
+          <u:Value>85</u:Value>
+        </Id>
+        <ClipMode>ClipRight</ClipMode>
+        <FieldName z:Id="33">Level</FieldName>
+        <Name z:Ref="33" i:nil="true" />
+        <Position>-1</Position>
+        <Width>85</Width>
+        <WindowId>18</WindowId>
+      </ColumnConfig>
+      <ColumnConfig z:Id="34">
+        <Id>
+          <u:Value>86</u:Value>
+        </Id>
+        <ClipMode>ClipMiddle</ClipMode>
+        <FieldName z:Id="35">Logger</FieldName>
+        <Name z:Ref="35" i:nil="true" />
+        <Position>2</Position>
+        <Width>120</Width>
+        <WindowId>18</WindowId>
+      </ColumnConfig>
+      <ColumnConfig z:Id="36">
+        <Id>
+          <u:Value>87</u:Value>
+        </Id>
+        <ClipMode>ClipRight</ClipMode>
+        <FieldName z:Id="37">Source</FieldName>
+        <Name z:Ref="37" i:nil="true" />
+        <Position>-1</Position>
+        <Width>90</Width>
+        <WindowId>18</WindowId>
+      </ColumnConfig>
+      <ColumnConfig z:Id="38">
+        <Id>
+          <u:Value>88</u:Value>
+        </Id>
+        <ClipMode>ClipRight</ClipMode>
+        <FieldName z:Id="39">Message</FieldName>
+        <Name z:Ref="39" i:nil="true" />
+        <Position>3</Position>
+        <Width>874</Width>
+        <WindowId>18</WindowId>
+      </ColumnConfig>
+      <ColumnConfig z:Id="40">
+        <Id>
+          <u:Value>89</u:Value>
+        </Id>
+        <ClipMode>ClipRight</ClipMode>
+        <FieldName z:Id="41">Thread</FieldName>
+        <Name z:Ref="41" i:nil="true" />
+        <Position>-1</Position>
+        <Width>95</Width>
+        <WindowId>18</WindowId>
+      </ColumnConfig>
+      <ColumnConfig z:Id="42">
+        <Id>
+          <u:Value>90</u:Value>
+        </Id>
+        <ClipMode>ClipRight</ClipMode>
+        <FieldName z:Id="43">Host</FieldName>
+        <Name z:Ref="43" i:nil="true" />
+        <Position>-1</Position>
+        <Width>90</Width>
+        <WindowId>18</WindowId>
+      </ColumnConfig>
+      <ColumnConfig z:Id="44">
+        <Id>
+          <u:Value>91</u:Value>
+        </Id>
+        <ClipMode>ClipRight</ClipMode>
+        <FieldName z:Id="45">Exception</FieldName>
+        <Name z:Ref="45" i:nil="true" />
+        <Position>-1</Position>
+        <Width>120</Width>
+        <WindowId>18</WindowId>
+      </ColumnConfig>
+      <ColumnConfig z:Id="46">
+        <Id>
+          <u:Value>92</u:Value>
+        </Id>
+        <ClipMode>ClipRight</ClipMode>
+        <FieldName z:Id="47">Domain</FieldName>
+        <Name z:Ref="47" i:nil="true" />
+        <Position>-1</Position>
+        <Width>90</Width>
+        <WindowId>18</WindowId>
+      </ColumnConfig>
+      <ColumnConfig z:Id="48">
+        <Id>
+          <u:Value>93</u:Value>
+        </Id>
+        <ClipMode>ClipRight</ClipMode>
+        <FieldName z:Id="49">Identity</FieldName>
+        <Name z:Ref="49" i:nil="true" />
+        <Position>-1</Position>
+        <Width>120</Width>
+        <WindowId>18</WindowId>
+      </ColumnConfig>
+      <ColumnConfig z:Id="50">
+        <Id>
+          <u:Value>94</u:Value>
+        </Id>
+        <ClipMode>ClipRight</ClipMode>
+        <FieldName z:Id="51">User</FieldName>
+        <Name z:Ref="51" i:nil="true" />
+        <Position>-1</Position>
+        <Width>90</Width>
+        <WindowId>18</WindowId>
+      </ColumnConfig>
+      <ColumnConfig z:Id="52">
+        <Id>
+          <u:Value>95</u:Value>
+        </Id>
+        <ClipMode>ClipRight</ClipMode>
+        <FieldName z:Id="53">Class</FieldName>
+        <Name z:Ref="53" i:nil="true" />
+        <Position>-1</Position>
+        <Width>90</Width>
+        <WindowId>18</WindowId>
+      </ColumnConfig>
+      <ColumnConfig z:Id="54">
+        <Id>
+          <u:Value>96</u:Value>
+        </Id>
+        <ClipMode>ClipRight</ClipMode>
+        <FieldName z:Id="55">Method</FieldName>
+        <Name z:Ref="55" i:nil="true" />
+        <Position>-1</Position>
+        <Width>120</Width>
+        <WindowId>18</WindowId>
+      </ColumnConfig>
+      <ColumnConfig z:Id="56">
+        <Id>
+          <u:Value>97</u:Value>
+        </Id>
+        <ClipMode>ClipRight</ClipMode>
+        <FieldName z:Id="57">File</FieldName>
+        <Name z:Ref="57" i:nil="true" />
+        <Position>-1</Position>
+        <Width>120</Width>
+        <WindowId>18</WindowId>
+      </ColumnConfig>
+      <ColumnConfig z:Id="58">
+        <Id>
+          <u:Value>98</u:Value>
+        </Id>
+        <ClipMode>ClipRight</ClipMode>
+        <FieldName z:Id="59">Line</FieldName>
+        <Name z:Ref="59" i:nil="true" />
+        <Position>-1</Position>
+        <Width>45</Width>
+        <WindowId>18</WindowId>
+      </ColumnConfig>
+      <ColumnConfig z:Id="60">
+        <Id>
+          <u:Value>99</u:Value>
+        </Id>
+        <ClipMode>ClipRight</ClipMode>
+        <FieldName z:Id="61">NDC</FieldName>
+        <Name z:Ref="61" i:nil="true" />
+        <Position>-1</Position>
+        <Width>120</Width>
+        <WindowId>18</WindowId>
+      </ColumnConfig>
+      <ColumnConfig z:Id="62">
+        <Id>
+          <u:Value>100</u:Value>
+        </Id>
+        <ClipMode>ClipRight</ClipMode>
+        <FieldName z:Id="63">MDC</FieldName>
+        <Name z:Ref="63" i:nil="true" />
+        <Position>-1</Position>
+        <Width>120</Width>
+        <WindowId>18</WindowId>
+      </ColumnConfig>
+      <ColumnConfig z:Id="64">
+        <Id>
+          <u:Value>101</u:Value>
+        </Id>
+        <ClipMode>ClipRight</ClipMode>
+        <FieldName z:Id="65">Comment</FieldName>
+        <Name z:Ref="65" i:nil="true" />
+        <Position>-1</Position>
+        <Width>120</Width>
+        <WindowId>18</WindowId>
+      </ColumnConfig>
+      <ColumnConfig z:Id="66">
+        <Id>
+          <u:Value>102</u:Value>
+        </Id>
+        <ClipMode>ClipRight</ClipMode>
+        <FieldName z:Id="67">StackTrace</FieldName>
+        <Name z:Ref="67" i:nil="true" />
+        <Position>-1</Position>
+        <Width>120</Width>
+        <WindowId>18</WindowId>
+      </ColumnConfig>
+      <ColumnConfig z:Id="68">
+        <Id>
+          <u:Value>103</u:Value>
+        </Id>
+        <ClipMode>ClipRight</ClipMode>
+        <FieldName z:Id="69">ProcessId</FieldName>
+        <Name z:Ref="69" i:nil="true" />
+        <Position>-1</Position>
+        <Width>120</Width>
+        <WindowId>18</WindowId>
+      </ColumnConfig>
+      <ColumnConfig z:Id="70">
+        <Id>
+          <u:Value>104</u:Value>
+        </Id>
+        <ClipMode>ClipRight</ClipMode>
+        <FieldName z:Id="71">ThreadId</FieldName>
+        <Name z:Ref="71" i:nil="true" />
+        <Position>-1</Position>
+        <Width>120</Width>
+        <WindowId>18</WindowId>
+      </ColumnConfig>
+      <ColumnConfig z:Id="72">
+        <Id>
+          <u:Value>105</u:Value>
+        </Id>
+        <ClipMode>ClipRight</ClipMode>
+        <FieldName z:Id="73">CallStack</FieldName>
+        <Name z:Ref="73" i:nil="true" />
+        <Position>-1</Position>
+        <Width>120</Width>
+        <WindowId>18</WindowId>
+      </ColumnConfig>
+      <ColumnConfig z:Id="74">
+        <Id>
+          <u:Value>106</u:Value>
+        </Id>
+        <ClipMode>ClipRight</ClipMode>
+        <FieldName z:Id="75">assembly</FieldName>
+        <Name z:Ref="75" i:nil="true" />
+        <Position>-1</Position>
+        <Width>120</Width>
+        <WindowId>18</WindowId>
+      </ColumnConfig>
+    </_columns>
+    <_filters z:Id="76" z:Size="0" />
+    <_formats z:Id="77" z:Size="1">
+      <FormatConfig z:Id="78">
+        <Id>
+          <u:Value>0</u:Value>
+        </Id>
+        <ConditionFieldName z:Ref="39" i:nil="true" />
+        <ConditionRelation z:Id="79"></ConditionRelation>
+        <ConditionText z:Ref="79" i:nil="true" />
+        <Formats z:Id="80" z:Size="12">
+          <a:KeyValueOfLogLevelLoggerFormatConfigxIppDzWS>
+            <a:Key z:Id="81" i:type="LogLevelSurrogated">
+              <LevelName z:Id="82">VERBOSE</LevelName>
+            </a:Key>
+            <a:Value z:Id="83">
+              <Id>
+                <u:Value>4</u:Value>
+              </Id>
+              <Backcolor>
+                <b:knownColor>0</b:knownColor>
+                <b:name i:nil="true" />
+                <b:state>0</b:state>
+                <b:value>0</b:value>
+              </Backcolor>
+              <FontName z:Id="84">Tahoma</FontName>
+              <Forecolor>
+                <b:knownColor>0</b:knownColor>
+                <b:name i:nil="true" />
+                <b:state>2</b:state>
+                <b:value>4290032820</b:value>
+              </Forecolor>
+              <Loglevel z:Ref="81" i:nil="true" />
+              <Size>8.25</Size>
+              <Style>Regular</Style>
+            </a:Value>
+          </a:KeyValueOfLogLevelLoggerFormatConfigxIppDzWS>
+          <a:KeyValueOfLogLevelLoggerFormatConfigxIppDzWS>
+            <a:Key z:Id="85" i:type="LogLevelSurrogated">
+              <LevelName z:Id="86">TRACE</LevelName>
+            </a:Key>
+            <a:Value z:Id="87">
+              <Id>
+                <u:Value>5</u:Value>
+              </Id>
+              <Backcolor>
+                <b:knownColor>0</b:knownColor>
+                <b:name i:nil="true" />
+                <b:state>0</b:state>
+                <b:value>0</b:value>
+              </Backcolor>
+              <FontName z:Id="88">Tahoma</FontName>
+              <Forecolor>
+                <b:knownColor>0</b:knownColor>
+                <b:name i:nil="true" />
+                <b:state>2</b:state>
+                <b:value>4288716960</b:value>
+              </Forecolor>
+              <Loglevel z:Ref="85" i:nil="true" />
+              <Size>8.25</Size>
+              <Style>Regular</Style>
+            </a:Value>
+          </a:KeyValueOfLogLevelLoggerFormatConfigxIppDzWS>
+          <a:KeyValueOfLogLevelLoggerFormatConfigxIppDzWS>
+            <a:Key z:Id="89" i:type="LogLevelSurrogated">
+              <LevelName z:Id="90">DEBUG</LevelName>
+            </a:Key>
+            <a:Value z:Id="91">
+              <Id>
+                <u:Value>6</u:Value>
+              </Id>
+              <Backcolor>
+                <b:knownColor>0</b:knownColor>
+                <b:name i:nil="true" />
+                <b:state>0</b:state>
+                <b:value>0</b:value>
+              </Backcolor>
+              <FontName z:Id="92">Tahoma</FontName>
+              <Forecolor>
+                <b:knownColor>0</b:knownColor>
+                <b:name i:nil="true" />
+                <b:state>2</b:state>
+                <b:value>4286743170</b:value>
+              </Forecolor>
+              <Loglevel z:Ref="89" i:nil="true" />
+              <Size>8.25</Size>
+              <Style>Regular</Style>
+            </a:Value>
+          </a:KeyValueOfLogLevelLoggerFormatConfigxIppDzWS>
+          <a:KeyValueOfLogLevelLoggerFormatConfigxIppDzWS>
+            <a:Key z:Id="93" i:type="LogLevelSurrogated">
+              <LevelName z:Id="94">INFO</LevelName>
+            </a:Key>
+            <a:Value z:Id="95">
+              <Id>
+                <u:Value>7</u:Value>
+              </Id>
+              <Backcolor>
+                <b:knownColor>0</b:knownColor>
+                <b:name i:nil="true" />
+                <b:state>0</b:state>
+                <b:value>0</b:value>
+              </Backcolor>
+              <FontName z:Id="96">Tahoma</FontName>
+              <Forecolor>
+                <b:knownColor>0</b:knownColor>
+                <b:name i:nil="true" />
+                <b:state>2</b:state>
+                <b:value>4278190080</b:value>
+              </Forecolor>
+              <Loglevel z:Ref="93" i:nil="true" />
+              <Size>8.25</Size>
+              <Style>Regular</Style>
+            </a:Value>
+          </a:KeyValueOfLogLevelLoggerFormatConfigxIppDzWS>
+          <a:KeyValueOfLogLevelLoggerFormatConfigxIppDzWS>
+            <a:Key z:Id="97" i:type="LogLevelSurrogated">
+              <LevelName z:Id="98">NOTICE</LevelName>
+            </a:Key>
+            <a:Value z:Id="99">
+              <Id>
+                <u:Value>8</u:Value>
+              </Id>
+              <Backcolor>
+                <b:knownColor>0</b:knownColor>
+                <b:name i:nil="true" />
+                <b:state>0</b:state>
+                <b:value>0</b:value>
+              </Backcolor>
+              <FontName z:Id="100">Tahoma</FontName>
+              <Forecolor>
+                <b:knownColor>0</b:knownColor>
+                <b:name i:nil="true" />
+                <b:state>2</b:state>
+                <b:value>4281957177</b:value>
+              </Forecolor>
+              <Loglevel z:Ref="97" i:nil="true" />
+              <Size>8.25</Size>
+              <Style>Regular</Style>
+            </a:Value>
+          </a:KeyValueOfLogLevelLoggerFormatConfigxIppDzWS>
+          <a:KeyValueOfLogLevelLoggerFormatConfigxIppDzWS>
+            <a:Key z:Id="101" i:type="LogLevelSurrogated">
+              <LevelName z:Id="102">WARN</LevelName>
+            </a:Key>
+            <a:Value z:Id="103">
+              <Id>
+                <u:Value>9</u:Value>
+              </Id>
+              <Backcolor>
+                <b:knownColor>0</b:knownColor>
+                <b:name i:nil="true" />
+                <b:state>0</b:state>
+                <b:value>0</b:value>
+              </Backcolor>
+              <FontName z:Id="104">Tahoma</FontName>
+              <Forecolor>
+                <b:knownColor>0</b:knownColor>
+                <b:name i:nil="true" />
+                <b:state>2</b:state>
+                <b:value>4294934528</b:value>
+              </Forecolor>
+              <Loglevel z:Ref="101" i:nil="true" />
+              <Size>8.25</Size>
+              <Style>Regular</Style>
+            </a:Value>
+          </a:KeyValueOfLogLevelLoggerFormatConfigxIppDzWS>
+          <a:KeyValueOfLogLevelLoggerFormatConfigxIppDzWS>
+            <a:Key z:Id="105" i:type="LogLevelSurrogated">
+              <LevelName z:Id="106">ERROR</LevelName>
+            </a:Key>
+            <a:Value z:Id="107">
+              <Id>
+                <u:Value>10</u:Value>
+              </Id>
+              <Backcolor>
+                <b:knownColor>0</b:knownColor>
+                <b:name i:nil="true" />
+                <b:state>0</b:state>
+                <b:value>0</b:value>
+              </Backcolor>
+              <FontName z:Id="108">Tahoma</FontName>
+              <Forecolor>
+                <b:knownColor>0</b:knownColor>
+                <b:name i:nil="true" />
+                <b:state>2</b:state>
+                <b:value>4294901760</b:value>
+              </Forecolor>
+              <Loglevel z:Ref="105" i:nil="true" />
+              <Size>8.25</Size>
+              <Style>Regular</Style>
+            </a:Value>
+          </a:KeyValueOfLogLevelLoggerFormatConfigxIppDzWS>
+          <a:KeyValueOfLogLevelLoggerFormatConfigxIppDzWS>
+            <a:Key z:Id="109" i:type="LogLevelSurrogated">
+              <LevelName z:Id="110">SEVERE</LevelName>
+            </a:Key>
+            <a:Value z:Id="111">
+              <Id>
+                <u:Value>11</u:Value>
+              </Id>
+              <Backcolor>
+                <b:knownColor>0</b:knownColor>
+                <b:name i:nil="true" />
+                <b:state>0</b:state>
+                <b:value>0</b:value>
+              </Backcolor>
+              <FontName z:Id="112">Tahoma</FontName>
+              <Forecolor>
+                <b:knownColor>0</b:knownColor>
+                <b:name i:nil="true" />
+                <b:state>2</b:state>
+                <b:value>4293067295</b:value>
+              </Forecolor>
+              <Loglevel z:Ref="109" i:nil="true" />
+              <Size>8.25</Size>
+              <Style>Regular</Style>
+            </a:Value>
+          </a:KeyValueOfLogLevelLoggerFormatConfigxIppDzWS>
+          <a:KeyValueOfLogLevelLoggerFormatConfigxIppDzWS>
+            <a:Key z:Id="113" i:type="LogLevelSurrogated">
+              <LevelName z:Id="114">CRITICAL</LevelName>
+            </a:Key>
+            <a:Value z:Id="115">
+              <Id>
+                <u:Value>12</u:Value>
+              </Id>
+              <Backcolor>
+                <b:knownColor>0</b:knownColor>
+                <b:name i:nil="true" />
+                <b:state>0</b:state>
+                <b:value>0</b:value>
+              </Backcolor>
+              <FontName z:Id="116">Tahoma</FontName>
+              <Forecolor>
+                <b:knownColor>0</b:knownColor>
+                <b:name i:nil="true" />
+                <b:state>2</b:state>
+                <b:value>4289400377</b:value>
+              </Forecolor>
+              <Loglevel z:Ref="113" i:nil="true" />
+              <Size>8.25</Size>
+              <Style>Regular</Style>
+            </a:Value>
+          </a:KeyValueOfLogLevelLoggerFormatConfigxIppDzWS>
+          <a:KeyValueOfLogLevelLoggerFormatConfigxIppDzWS>
+            <a:Key z:Id="117" i:type="LogLevelSurrogated">
+              <LevelName z:Id="118">ALERT</LevelName>
+            </a:Key>
+            <a:Value z:Id="119">
+              <Id>
+                <u:Value>13</u:Value>
+              </Id>
+              <Backcolor>
+                <b:knownColor>0</b:knownColor>
+                <b:name i:nil="true" />
+                <b:state>0</b:state>
+                <b:value>0</b:value>
+              </Backcolor>
+              <FontName z:Id="120">Tahoma</FontName>
+              <Forecolor>
+                <b:knownColor>0</b:knownColor>
+                <b:name i:nil="true" />
+                <b:state>2</b:state>
+                <b:value>4294902015</b:value>
+              </Forecolor>
+              <Loglevel z:Ref="117" i:nil="true" />
+              <Size>8.25</Size>
+              <Style>Regular</Style>
+            </a:Value>
+          </a:KeyValueOfLogLevelLoggerFormatConfigxIppDzWS>
+          <a:KeyValueOfLogLevelLoggerFormatConfigxIppDzWS>
+            <a:Key z:Id="121" i:type="LogLevelSurrogated">
+              <LevelName z:Id="122">FATAL</LevelName>
+            </a:Key>
+            <a:Value z:Id="123">
+              <Id>
+                <u:Value>14</u:Value>
+              </Id>
+              <Backcolor>
+                <b:knownColor>0</b:knownColor>
+                <b:name i:nil="true" />
+                <b:state>0</b:state>
+                <b:value>0</b:value>
+              </Backcolor>
+              <FontName z:Id="124">Tahoma</FontName>
+              <Forecolor>
+                <b:knownColor>0</b:knownColor>
+                <b:name i:nil="true" />
+                <b:state>2</b:state>
+                <b:value>4287309977</b:value>
+              </Forecolor>
+              <Loglevel z:Ref="121" i:nil="true" />
+              <Size>8.25</Size>
+              <Style>Regular</Style>
+            </a:Value>
+          </a:KeyValueOfLogLevelLoggerFormatConfigxIppDzWS>
+          <a:KeyValueOfLogLevelLoggerFormatConfigxIppDzWS>
+            <a:Key z:Id="125" i:type="LogLevelSurrogated">
+              <LevelName z:Id="126">EMERGENCY</LevelName>
+            </a:Key>
+            <a:Value z:Id="127">
+              <Id>
+                <u:Value>15</u:Value>
+              </Id>
+              <Backcolor>
+                <b:knownColor>0</b:knownColor>
+                <b:name i:nil="true" />
+                <b:state>0</b:state>
+                <b:value>0</b:value>
+              </Backcolor>
+              <FontName z:Id="128">Tahoma</FontName>
+              <Forecolor>
+                <b:knownColor>0</b:knownColor>
+                <b:name i:nil="true" />
+                <b:state>2</b:state>
+                <b:value>4285932413</b:value>
+              </Forecolor>
+              <Loglevel z:Ref="125" i:nil="true" />
+              <Size>8.25</Size>
+              <Style>Regular</Style>
+            </a:Value>
+          </a:KeyValueOfLogLevelLoggerFormatConfigxIppDzWS>
+        </Formats>
+        <IgnoreCase>false</IgnoreCase>
+        <Name z:Id="129">Default Format Settings</Name>
+      </FormatConfig>
+    </_formats>
+    <_logLevels z:Id="130" z:Size="0" />
+    <_loggers z:Id="131" z:Size="1">
+      <LoggerConfig z:Id="132">
+        <Id>
+          <u:Value>77</u:Value>
+        </Id>
+        <LogLevel z:Ref="6" i:nil="true" />
+        <LoggerPath z:Ref="79" i:nil="true" />
+        <ReceiverId>16</ReceiverId>
+      </LoggerConfig>
+    </_loggers>
+  </Presentation>
+  <Version>17</Version>
+</Config>
--- a/Logo/1024.png
+++ b/Logo/1024.png
--- a/Logo/128.png
+++ b/Logo/128.png
--- a/Logo/16.png
+++ b/Logo/16.png
--- a/Logo/256.png
+++ b/Logo/256.png
--- a/Logo/32.png
+++ b/Logo/32.png
--- a/Logo/400.png
+++ b/Logo/400.png
--- a/Logo/48.png
+++ b/Logo/48.png
--- a/Logo/512.png
+++ b/Logo/512.png
--- a/Logo/64.png
+++ b/Logo/64.png
--- a/Logo/800.png
+++ b/Logo/800.png
--- a/Logo/Radarr.svg
+++ b/Logo/Radarr.svg
@@ -1,572 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="1024px" height="1024px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 41.2 (35397) - http://www.bohemiancoding.com/sketch -->
-    <title>SVG</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <ellipse id="path-1" cx="512" cy="512" rx="512" ry="512"></ellipse>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="1024" height="1024" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <mask id="mask-4" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="1024" height="1024" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <polygon id="path-5" points="0 0 1007.8334 0 1007.8334 1181.7303 0 1181.7303"></polygon>
-        <polygon id="path-7" points="0 0.308593451 979.971467 0.308593451 979.971467 66.8717453 0 66.8717453"></polygon>
-        <polygon id="path-9" points="0 0.308593451 979.971467 0.308593451 979.971467 66.8717453 0 66.8717453"></polygon>
-        <polygon id="path-11" points="0 0.308593451 979.971467 0.308593451 979.971467 66.8717453 0 66.8717453"></polygon>
-        <polygon id="path-13" points="0 0.308593451 979.971467 0.308593451 979.971467 66.8717453 0 66.8717453"></polygon>
-        <polygon id="path-15" points="0 0.308593451 979.971467 0.308593451 979.971467 66.8717453 0 66.8717453"></polygon>
-        <polygon id="path-17" points="0 0.308593451 979.971467 0.308593451 979.971467 66.8717453 0 66.8717453"></polygon>
-        <polygon id="path-19" points="0 0.308593451 979.971467 0.308593451 979.971467 66.8717453 0 66.8717453"></polygon>
-        <polygon id="path-21" points="0 0.308593451 979.971467 0.308593451 979.971467 66.8717453 0 66.8717453"></polygon>
-        <polygon id="path-23" points="0 0.308593451 979.971467 0.308593451 979.971467 66.8717453 0 66.8717453"></polygon>
-        <polygon id="path-25" points="0 0.308593451 979.971467 0.308593451 979.971467 66.8717453 0 66.8717453"></polygon>
-        <polygon id="path-27" points="0 0.308593451 979.971467 0.308593451 979.971467 66.8717453 0 66.8717453"></polygon>
-        <polygon id="path-29" points="0 0.308593451 979.971467 0.308593451 979.971467 66.8717453 0 66.8717453"></polygon>
-        <polygon id="path-31" points="0 0.308593451 979.971467 0.308593451 979.971467 66.8717453 0 66.8717453"></polygon>
-        <polygon id="path-33" points="0 0.308593451 979.971467 0.308593451 979.971467 66.8717453 0 66.8717453"></polygon>
-        <polygon id="path-35" points="0 0.308593451 979.971467 0.308593451 979.971467 66.8717453 0 66.8717453"></polygon>
-        <polygon id="path-37" points="0 0.308593451 979.971467 0.308593451 979.971467 66.8717453 0 66.8717453"></polygon>
-        <polygon id="path-39" points="0 0.308593451 979.971467 0.308593451 979.971467 66.8717453 0 66.8717453"></polygon>
-        <polygon id="path-41" points="0 0.308593451 979.971467 0.308593451 979.971467 66.8717453 0 66.8717453"></polygon>
-        <polygon id="path-43" points="0 0.308593451 979.971467 0.308593451 979.971467 66.8717453 0 66.8717453"></polygon>
-        <polygon id="path-45" points="0 0.308593451 979.971467 0.308593451 979.971467 66.8717453 0 66.8717453"></polygon>
-        <path d="M211.257613,211.421878 C134.335253,288.344238 86.7577838,394.611489 86.7577838,511.991053 C86.7577838,629.370617 134.335253,735.637868 211.257613,812.560228 L511.826788,511.991053 L211.257613,211.421878 Z" id="path-47"></path>
-        <path d="M639.447177,208.78225 C562.524817,285.704609 514.947349,391.97186 514.947349,509.351425 C514.947349,626.730989 562.524817,732.99824 639.447177,809.9206 L940.016353,509.351425 L639.447177,208.78225 Z" id="path-49"></path>
-        <ellipse id="path-51" cx="512" cy="512" rx="512" ry="512"></ellipse>
-        <mask id="mask-52" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="1024" height="1024" fill="white">
-            <use xlink:href="#path-51"></use>
-        </mask>
-    </defs>
-    <g id="Logo" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="SVG">
-            <mask id="mask-3" fill="white">
-                <use xlink:href="#path-1"></use>
-            </mask>
-            <g id="Mask" stroke="#FFC231" mask="url(#mask-2)" stroke-width="40" fill="#050808">
-                <use mask="url(#mask-4)" xlink:href="#path-1"></use>
-            </g>
-            <g id="Grid" mask="url(#mask-3)">
-                <g transform="translate(23.843025, 1.692150)">
-                    <mask id="mask-6" fill="white">
-                        <use xlink:href="#path-5"></use>
-                    </mask>
-                    <g id="Duplicate-control" stroke="none" fill="none"></g>
-                    <g id="Group-2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" mask="url(#mask-6)">
-                        <g id="Group" transform="translate(0.000000, 0.924454)">
-                            <mask id="mask-8" fill="white">
-                                <use xlink:href="#path-7"></use>
-                            </mask>
-                            <g id="Duplicate-control"></g>
-                            <polygon id="Polygon" stroke="#999999" mask="url(#mask-8)" points="28.8226902 0.308593451 57.6453804 16.9493814 57.6453804 50.2309573 28.8226902 66.8717453 1.95399252e-13 50.2309573 1.76747506e-13 16.9493814"></polygon>
-                            <polygon id="Polygon" stroke="#999999" mask="url(#mask-8)" points="951.148777 0.308593451 979.971467 16.9493814 979.971467 50.2309573 951.148777 66.8717453 922.326087 50.2309573 922.326087 16.9493814"></polygon>
-                            <polygon id="Polygon" stroke="#999999" mask="url(#mask-8)" points="893.503397 0.308593451 922.326087 16.9493814 922.326087 50.2309573 893.503397 66.8717453 864.680706 50.2309573 864.680706 16.9493814"></polygon>
-                            <polygon id="Polygon" stroke="#999999" mask="url(#mask-8)" points="835.858016 0.308593451 864.680706 16.9493814 864.680706 50.2309573 835.858016 66.8717453 807.035326 50.2309573 807.035326 16.9493814"></polygon>
-                            <polygon id="Polygon" stroke="#999999" mask="url(#mask-8)" points="778.212636 0.308593451 807.035326 16.9493814 807.035326 50.2309573 778.212636 66.8717453 749.389945 50.2309573 749.389945 16.9493814"></polygon>
-                            <polygon id="Polygon" stroke="#999999" mask="url(#mask-8)" points="720.567255 0.308593451 749.389945 16.9493814 749.389945 50.2309573 720.567255 66.8717453 691.744565 50.2309573 691.744565 16.9493814"></polygon>
-                            <polygon id="Polygon" stroke="#999999" mask="url(#mask-8)" points="662.921875 0.308593451 691.744565 16.9493814 691.744565 50.2309573 662.921875 66.8717453 634.099185 50.2309573 634.099185 16.9493814"></polygon>
-                            <polygon id="Polygon" stroke="#999999" mask="url(#mask-8)" points="605.276494 0.308593451 634.099185 16.9493814 634.099185 50.2309573 605.276494 66.8717453 576.453804 50.2309573 576.453804 16.9493814"></polygon>
-                            <polygon id="Polygon" stroke="#999999" mask="url(#mask-8)" points="547.631114 0.308593451 576.453804 16.9493814 576.453804 50.2309573 547.631114 66.8717453 518.808424 50.2309573 518.808424 16.9493814"></polygon>
-                            <polygon id="Polygon" stroke="#999999" mask="url(#mask-8)" points="489.985734 0.308593451 518.808424 16.9493814 518.808424 50.2309573 489.985734 66.8717453 461.163043 50.2309573 461.163043 16.9493814"></polygon>
-                            <polygon id="Polygon" stroke="#999999" mask="url(#mask-8)" points="432.340353 0.308593451 461.163043 16.9493814 461.163043 50.2309573 432.340353 66.8717453 403.517663 50.2309573 403.517663 16.9493814"></polygon>
-                            <polygon id="Polygon" stroke="#999999" mask="url(#mask-8)" points="374.694973 0.308593451 403.517663 16.9493814 403.517663 50.2309573 374.694973 66.8717453 345.872283 50.2309573 345.872283 16.9493814"></polygon>
-                            <polygon id="Polygon" stroke="#999999" mask="url(#mask-8)" points="317.049592 0.308593451 345.872283 16.9493814 345.872283 50.2309573 317.049592 66.8717453 288.226902 50.2309573 288.226902 16.9493814"></polygon>
-                            <polygon id="Polygon" stroke="#999999" mask="url(#mask-8)" points="259.404212 0.308593451 288.226902 16.9493814 288.226902 50.2309573 259.404212 66.8717453 230.581522 50.2309573 230.581522 16.9493814"></polygon>
-                            <polygon id="Polygon" stroke="#999999" mask="url(#mask-8)" points="201.758831 0.308593451 230.581522 16.9493814 230.581522 50.2309573 201.758831 66.8717453 172.936141 50.2309573 172.936141 16.9493814"></polygon>
-                            <polygon id="Polygon" stroke="#999999" mask="url(#mask-8)" points="144.113451 0.308593451 172.936141 16.9493814 172.936141 50.2309573 144.113451 66.8717453 115.290761 50.2309573 115.290761 16.9493814"></polygon>
-                            <polygon id="Polygon" stroke="#999999" mask="url(#mask-8)" points="86.4680706 0.308593451 115.290761 16.9493814 115.290761 50.2309573 86.4680706 66.8717453 57.6453804 50.2309573 57.6453804 16.9493814"></polygon>
-                        </g>
-                        <g id="Group" transform="translate(27.861934, 50.883783)">
-                            <mask id="mask-10" fill="white">
-                                <use xlink:href="#path-9"></use>
-                            </mask>
-                            <g id="Duplicate-control"></g>
-                            <polygon id="Polygon" stroke="#999999" mask="url(#mask-10)" points="28.8226902 0.308593451 57.6453804 16.9493814 57.6453804 50.2309573 28.8226902 66.8717453 1.95399252e-13 50.2309573 1.76747506e-13 16.9493814"></polygon>
-                            <polygon id="Polygon" stroke="#999999" mask="url(#mask-10)" points="951.148777 0.308593451 979.971467 16.9493814 979.971467 50.2309573 951.148777 66.8717453 922.326087 50.2309573 922.326087 16.9493814"></polygon>
-                            <polygon id="Polygon" stroke="#999999" mask="url(#mask-10)" points="893.503397 0.308593451 922.326087 16.9493814 922.326087 50.2309573 893.503397 66.8717453 864.680706 50.2309573 864.680706 16.9493814"></polygon>
-                            <polygon id="Polygon" stroke="#999999" mask="url(#mask-10)" points="835.858016 0.308593451 864.680706 16.9493814 864.680706 50.2309573 835.858016 66.8717453 807.035326 50.2309573 807.035326 16.9493814"></polygon>
-                            <polygon id="Polygon" stroke="#999999" mask="url(#mask-10)" points="778.212636 0.308593451 807.035326 16.9493814 807.035326 50.2309573 778.212636 66.8717453 749.389945 50.2309573 749.389945 16.9493814"></polygon>
-                            <polygon id="Polygon" stroke="#999999" mask="url(#mask-10)" points="720.567255 0.308593451 749.389945 16.9493814 749.389945 50.2309573 720.567255 66.8717453 691.744565 50.2309573 691.744565 16.9493814"></polygon>
-                            <polygon id="Polygon" stroke="#999999" mask="url(#mask-10)" points="662.921875 0.308593451 691.744565 16.9493814 691.744565 50.2309573 662.921875 66.8717453 634.099185 50.2309573 634.099185 16.9493814"></polygon>
-                            <polygon id="Polygon" stroke="#999999" mask="url(#mask-10)" points="605.276494 0.308593451 634.099185 16.9493814 634.099185 50.2309573 605.276494 66.8717453 576.453804 50.2309573 576.453804 16.9493814"></polygon>
-                            <polygon id="Polygon" stroke="#999999" mask="url(#mask-10)" points="547.631114 0.308593451 576.453804 16.9493814 576.453804 50.2309573 547.631114 66.8717453 518.808424 50.2309573 518.808424 16.9493814"></polygon>
-                            <polygon id="Polygon" stroke="#999999" mask="url(#mask-10)" points="489.985734 0.308593451 518.808424 16.9493814 518.808424 50.2309573 489.985734 66.8717453 461.163043 50.2309573 461.163043 16.9493814"></polygon>
-                            <polygon id="Polygon" stroke="#999999" mask="url(#mask-10)" points="432.340353 0.308593451 461.163043 16.9493814 461.163043 50.2309573 432.340353 66.8717453 403.517663 50.2309573 403.517663 16.9493814"></polygon>
-                            <polygon id="Polygon" stroke="#999999" mask="url(#mask-10)" points="374.694973 0.308593451 403.517663 16.9493814 403.517663 50.2309573 374.694973 66.8717453 345.872283 50.2309573 345.872283 16.9493814"></polygon>
-                            <polygon id="Polygon" stroke="#999999" mask="url(#mask-10)" points="317.049592 0.308593451 345.872283 16.9493814 345.872283 50.2309573 317.049592 66.8717453 288.226902 50.2309573 288.226902 16.9493814"></polygon>
-                            <polygon id="Polygon" stroke="#999999" mask="url(#mask-10)" points="259.404212 0.308593451 288.226902 16.9493814 288.226902 50.2309573 259.404212 66.8717453 230.581522 50.2309573 230.581522 16.9493814"></polygon>
-                            <polygon id="Polygon" stroke="#999999" mask="url(#mask-10)" points="201.758831 0.308593451 230.581522 16.9493814 230.581522 50.2309573 201.758831 66.8717453 172.936141 50.2309573 172.936141 16.9493814"></polygon>
-                            <polygon id="Polygon" stroke="#999999" mask="url(#mask-10)" points="144.113451 0.308593451 172.936141 16.9493814 172.936141 50.2309573 144.113451 66.8717453 115.290761 50.2309573 115.290761 16.9493814"></polygon>
-                            <polygon id="Polygon" stroke="#999999" mask="url(#mask-10)" points="86.4680706 0.308593451 115.290761 16.9493814 115.290761 50.2309573 86.4680706 66.8717453 57.6453804 50.2309573 57.6453804 16.9493814"></polygon>
-                        </g>
-                    </g>
-                    <g id="Group-2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" mask="url(#mask-6)">
-                        <g transform="translate(0.000000, 901.189447)" id="Group">
-                            <g transform="translate(0.000000, 0.924454)">
-                                <mask id="mask-12" fill="white">
-                                    <use xlink:href="#path-11"></use>
-                                </mask>
-                                <g id="Duplicate-control"></g>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-12)" points="28.8226902 0.308593451 57.6453804 16.9493814 57.6453804 50.2309573 28.8226902 66.8717453 1.95399252e-13 50.2309573 1.76747506e-13 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-12)" points="951.148777 0.308593451 979.971467 16.9493814 979.971467 50.2309573 951.148777 66.8717453 922.326087 50.2309573 922.326087 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-12)" points="893.503397 0.308593451 922.326087 16.9493814 922.326087 50.2309573 893.503397 66.8717453 864.680706 50.2309573 864.680706 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-12)" points="835.858016 0.308593451 864.680706 16.9493814 864.680706 50.2309573 835.858016 66.8717453 807.035326 50.2309573 807.035326 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-12)" points="778.212636 0.308593451 807.035326 16.9493814 807.035326 50.2309573 778.212636 66.8717453 749.389945 50.2309573 749.389945 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-12)" points="720.567255 0.308593451 749.389945 16.9493814 749.389945 50.2309573 720.567255 66.8717453 691.744565 50.2309573 691.744565 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-12)" points="662.921875 0.308593451 691.744565 16.9493814 691.744565 50.2309573 662.921875 66.8717453 634.099185 50.2309573 634.099185 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-12)" points="605.276494 0.308593451 634.099185 16.9493814 634.099185 50.2309573 605.276494 66.8717453 576.453804 50.2309573 576.453804 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-12)" points="547.631114 0.308593451 576.453804 16.9493814 576.453804 50.2309573 547.631114 66.8717453 518.808424 50.2309573 518.808424 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-12)" points="489.985734 0.308593451 518.808424 16.9493814 518.808424 50.2309573 489.985734 66.8717453 461.163043 50.2309573 461.163043 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-12)" points="432.340353 0.308593451 461.163043 16.9493814 461.163043 50.2309573 432.340353 66.8717453 403.517663 50.2309573 403.517663 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-12)" points="374.694973 0.308593451 403.517663 16.9493814 403.517663 50.2309573 374.694973 66.8717453 345.872283 50.2309573 345.872283 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-12)" points="317.049592 0.308593451 345.872283 16.9493814 345.872283 50.2309573 317.049592 66.8717453 288.226902 50.2309573 288.226902 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-12)" points="259.404212 0.308593451 288.226902 16.9493814 288.226902 50.2309573 259.404212 66.8717453 230.581522 50.2309573 230.581522 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-12)" points="201.758831 0.308593451 230.581522 16.9493814 230.581522 50.2309573 201.758831 66.8717453 172.936141 50.2309573 172.936141 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-12)" points="144.113451 0.308593451 172.936141 16.9493814 172.936141 50.2309573 144.113451 66.8717453 115.290761 50.2309573 115.290761 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-12)" points="86.4680706 0.308593451 115.290761 16.9493814 115.290761 50.2309573 86.4680706 66.8717453 57.6453804 50.2309573 57.6453804 16.9493814"></polygon>
-                            </g>
-                            <g transform="translate(27.861934, 50.883783)">
-                                <mask id="mask-14" fill="white">
-                                    <use xlink:href="#path-13"></use>
-                                </mask>
-                                <g id="Duplicate-control"></g>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-14)" points="28.8226902 0.308593451 57.6453804 16.9493814 57.6453804 50.2309573 28.8226902 66.8717453 1.95399252e-13 50.2309573 1.76747506e-13 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-14)" points="951.148777 0.308593451 979.971467 16.9493814 979.971467 50.2309573 951.148777 66.8717453 922.326087 50.2309573 922.326087 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-14)" points="893.503397 0.308593451 922.326087 16.9493814 922.326087 50.2309573 893.503397 66.8717453 864.680706 50.2309573 864.680706 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-14)" points="835.858016 0.308593451 864.680706 16.9493814 864.680706 50.2309573 835.858016 66.8717453 807.035326 50.2309573 807.035326 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-14)" points="778.212636 0.308593451 807.035326 16.9493814 807.035326 50.2309573 778.212636 66.8717453 749.389945 50.2309573 749.389945 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-14)" points="720.567255 0.308593451 749.389945 16.9493814 749.389945 50.2309573 720.567255 66.8717453 691.744565 50.2309573 691.744565 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-14)" points="662.921875 0.308593451 691.744565 16.9493814 691.744565 50.2309573 662.921875 66.8717453 634.099185 50.2309573 634.099185 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-14)" points="605.276494 0.308593451 634.099185 16.9493814 634.099185 50.2309573 605.276494 66.8717453 576.453804 50.2309573 576.453804 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-14)" points="547.631114 0.308593451 576.453804 16.9493814 576.453804 50.2309573 547.631114 66.8717453 518.808424 50.2309573 518.808424 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-14)" points="489.985734 0.308593451 518.808424 16.9493814 518.808424 50.2309573 489.985734 66.8717453 461.163043 50.2309573 461.163043 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-14)" points="432.340353 0.308593451 461.163043 16.9493814 461.163043 50.2309573 432.340353 66.8717453 403.517663 50.2309573 403.517663 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-14)" points="374.694973 0.308593451 403.517663 16.9493814 403.517663 50.2309573 374.694973 66.8717453 345.872283 50.2309573 345.872283 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-14)" points="317.049592 0.308593451 345.872283 16.9493814 345.872283 50.2309573 317.049592 66.8717453 288.226902 50.2309573 288.226902 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-14)" points="259.404212 0.308593451 288.226902 16.9493814 288.226902 50.2309573 259.404212 66.8717453 230.581522 50.2309573 230.581522 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-14)" points="201.758831 0.308593451 230.581522 16.9493814 230.581522 50.2309573 201.758831 66.8717453 172.936141 50.2309573 172.936141 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-14)" points="144.113451 0.308593451 172.936141 16.9493814 172.936141 50.2309573 144.113451 66.8717453 115.290761 50.2309573 115.290761 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-14)" points="86.4680706 0.308593451 115.290761 16.9493814 115.290761 50.2309573 86.4680706 66.8717453 57.6453804 50.2309573 57.6453804 16.9493814"></polygon>
-                            </g>
-                        </g>
-                    </g>
-                    <g id="Group-2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" mask="url(#mask-6)">
-                        <g transform="translate(0.000000, 801.270788)" id="Group">
-                            <g transform="translate(0.000000, 0.924454)">
-                                <mask id="mask-16" fill="white">
-                                    <use xlink:href="#path-15"></use>
-                                </mask>
-                                <g id="Duplicate-control"></g>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-16)" points="28.8226902 0.308593451 57.6453804 16.9493814 57.6453804 50.2309573 28.8226902 66.8717453 1.95399252e-13 50.2309573 1.76747506e-13 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-16)" points="951.148777 0.308593451 979.971467 16.9493814 979.971467 50.2309573 951.148777 66.8717453 922.326087 50.2309573 922.326087 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-16)" points="893.503397 0.308593451 922.326087 16.9493814 922.326087 50.2309573 893.503397 66.8717453 864.680706 50.2309573 864.680706 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-16)" points="835.858016 0.308593451 864.680706 16.9493814 864.680706 50.2309573 835.858016 66.8717453 807.035326 50.2309573 807.035326 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-16)" points="778.212636 0.308593451 807.035326 16.9493814 807.035326 50.2309573 778.212636 66.8717453 749.389945 50.2309573 749.389945 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-16)" points="720.567255 0.308593451 749.389945 16.9493814 749.389945 50.2309573 720.567255 66.8717453 691.744565 50.2309573 691.744565 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-16)" points="662.921875 0.308593451 691.744565 16.9493814 691.744565 50.2309573 662.921875 66.8717453 634.099185 50.2309573 634.099185 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-16)" points="605.276494 0.308593451 634.099185 16.9493814 634.099185 50.2309573 605.276494 66.8717453 576.453804 50.2309573 576.453804 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-16)" points="547.631114 0.308593451 576.453804 16.9493814 576.453804 50.2309573 547.631114 66.8717453 518.808424 50.2309573 518.808424 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-16)" points="489.985734 0.308593451 518.808424 16.9493814 518.808424 50.2309573 489.985734 66.8717453 461.163043 50.2309573 461.163043 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-16)" points="432.340353 0.308593451 461.163043 16.9493814 461.163043 50.2309573 432.340353 66.8717453 403.517663 50.2309573 403.517663 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-16)" points="374.694973 0.308593451 403.517663 16.9493814 403.517663 50.2309573 374.694973 66.8717453 345.872283 50.2309573 345.872283 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-16)" points="317.049592 0.308593451 345.872283 16.9493814 345.872283 50.2309573 317.049592 66.8717453 288.226902 50.2309573 288.226902 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-16)" points="259.404212 0.308593451 288.226902 16.9493814 288.226902 50.2309573 259.404212 66.8717453 230.581522 50.2309573 230.581522 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-16)" points="201.758831 0.308593451 230.581522 16.9493814 230.581522 50.2309573 201.758831 66.8717453 172.936141 50.2309573 172.936141 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-16)" points="144.113451 0.308593451 172.936141 16.9493814 172.936141 50.2309573 144.113451 66.8717453 115.290761 50.2309573 115.290761 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-16)" points="86.4680706 0.308593451 115.290761 16.9493814 115.290761 50.2309573 86.4680706 66.8717453 57.6453804 50.2309573 57.6453804 16.9493814"></polygon>
-                            </g>
-                            <g transform="translate(27.861934, 50.883783)">
-                                <mask id="mask-18" fill="white">
-                                    <use xlink:href="#path-17"></use>
-                                </mask>
-                                <g id="Duplicate-control"></g>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-18)" points="28.8226902 0.308593451 57.6453804 16.9493814 57.6453804 50.2309573 28.8226902 66.8717453 1.95399252e-13 50.2309573 1.76747506e-13 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-18)" points="951.148777 0.308593451 979.971467 16.9493814 979.971467 50.2309573 951.148777 66.8717453 922.326087 50.2309573 922.326087 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-18)" points="893.503397 0.308593451 922.326087 16.9493814 922.326087 50.2309573 893.503397 66.8717453 864.680706 50.2309573 864.680706 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-18)" points="835.858016 0.308593451 864.680706 16.9493814 864.680706 50.2309573 835.858016 66.8717453 807.035326 50.2309573 807.035326 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-18)" points="778.212636 0.308593451 807.035326 16.9493814 807.035326 50.2309573 778.212636 66.8717453 749.389945 50.2309573 749.389945 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-18)" points="720.567255 0.308593451 749.389945 16.9493814 749.389945 50.2309573 720.567255 66.8717453 691.744565 50.2309573 691.744565 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-18)" points="662.921875 0.308593451 691.744565 16.9493814 691.744565 50.2309573 662.921875 66.8717453 634.099185 50.2309573 634.099185 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-18)" points="605.276494 0.308593451 634.099185 16.9493814 634.099185 50.2309573 605.276494 66.8717453 576.453804 50.2309573 576.453804 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-18)" points="547.631114 0.308593451 576.453804 16.9493814 576.453804 50.2309573 547.631114 66.8717453 518.808424 50.2309573 518.808424 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-18)" points="489.985734 0.308593451 518.808424 16.9493814 518.808424 50.2309573 489.985734 66.8717453 461.163043 50.2309573 461.163043 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-18)" points="432.340353 0.308593451 461.163043 16.9493814 461.163043 50.2309573 432.340353 66.8717453 403.517663 50.2309573 403.517663 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-18)" points="374.694973 0.308593451 403.517663 16.9493814 403.517663 50.2309573 374.694973 66.8717453 345.872283 50.2309573 345.872283 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-18)" points="317.049592 0.308593451 345.872283 16.9493814 345.872283 50.2309573 317.049592 66.8717453 288.226902 50.2309573 288.226902 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-18)" points="259.404212 0.308593451 288.226902 16.9493814 288.226902 50.2309573 259.404212 66.8717453 230.581522 50.2309573 230.581522 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-18)" points="201.758831 0.308593451 230.581522 16.9493814 230.581522 50.2309573 201.758831 66.8717453 172.936141 50.2309573 172.936141 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-18)" points="144.113451 0.308593451 172.936141 16.9493814 172.936141 50.2309573 144.113451 66.8717453 115.290761 50.2309573 115.290761 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-18)" points="86.4680706 0.308593451 115.290761 16.9493814 115.290761 50.2309573 86.4680706 66.8717453 57.6453804 50.2309573 57.6453804 16.9493814"></polygon>
-                            </g>
-                        </g>
-                    </g>
-                    <g id="Group-2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" mask="url(#mask-6)">
-                        <g transform="translate(0.000000, 700.391372)" id="Group">
-                            <g transform="translate(0.000000, 0.924454)">
-                                <mask id="mask-20" fill="white">
-                                    <use xlink:href="#path-19"></use>
-                                </mask>
-                                <g id="Duplicate-control"></g>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-20)" points="28.8226902 0.308593451 57.6453804 16.9493814 57.6453804 50.2309573 28.8226902 66.8717453 1.95399252e-13 50.2309573 1.76747506e-13 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-20)" points="951.148777 0.308593451 979.971467 16.9493814 979.971467 50.2309573 951.148777 66.8717453 922.326087 50.2309573 922.326087 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-20)" points="893.503397 0.308593451 922.326087 16.9493814 922.326087 50.2309573 893.503397 66.8717453 864.680706 50.2309573 864.680706 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-20)" points="835.858016 0.308593451 864.680706 16.9493814 864.680706 50.2309573 835.858016 66.8717453 807.035326 50.2309573 807.035326 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-20)" points="778.212636 0.308593451 807.035326 16.9493814 807.035326 50.2309573 778.212636 66.8717453 749.389945 50.2309573 749.389945 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-20)" points="720.567255 0.308593451 749.389945 16.9493814 749.389945 50.2309573 720.567255 66.8717453 691.744565 50.2309573 691.744565 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-20)" points="662.921875 0.308593451 691.744565 16.9493814 691.744565 50.2309573 662.921875 66.8717453 634.099185 50.2309573 634.099185 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-20)" points="605.276494 0.308593451 634.099185 16.9493814 634.099185 50.2309573 605.276494 66.8717453 576.453804 50.2309573 576.453804 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-20)" points="547.631114 0.308593451 576.453804 16.9493814 576.453804 50.2309573 547.631114 66.8717453 518.808424 50.2309573 518.808424 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-20)" points="489.985734 0.308593451 518.808424 16.9493814 518.808424 50.2309573 489.985734 66.8717453 461.163043 50.2309573 461.163043 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-20)" points="432.340353 0.308593451 461.163043 16.9493814 461.163043 50.2309573 432.340353 66.8717453 403.517663 50.2309573 403.517663 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-20)" points="374.694973 0.308593451 403.517663 16.9493814 403.517663 50.2309573 374.694973 66.8717453 345.872283 50.2309573 345.872283 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-20)" points="317.049592 0.308593451 345.872283 16.9493814 345.872283 50.2309573 317.049592 66.8717453 288.226902 50.2309573 288.226902 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-20)" points="259.404212 0.308593451 288.226902 16.9493814 288.226902 50.2309573 259.404212 66.8717453 230.581522 50.2309573 230.581522 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-20)" points="201.758831 0.308593451 230.581522 16.9493814 230.581522 50.2309573 201.758831 66.8717453 172.936141 50.2309573 172.936141 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-20)" points="144.113451 0.308593451 172.936141 16.9493814 172.936141 50.2309573 144.113451 66.8717453 115.290761 50.2309573 115.290761 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-20)" points="86.4680706 0.308593451 115.290761 16.9493814 115.290761 50.2309573 86.4680706 66.8717453 57.6453804 50.2309573 57.6453804 16.9493814"></polygon>
-                            </g>
-                            <g transform="translate(27.861934, 50.883783)">
-                                <mask id="mask-22" fill="white">
-                                    <use xlink:href="#path-21"></use>
-                                </mask>
-                                <g id="Duplicate-control"></g>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-22)" points="28.8226902 0.308593451 57.6453804 16.9493814 57.6453804 50.2309573 28.8226902 66.8717453 1.95399252e-13 50.2309573 1.76747506e-13 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-22)" points="951.148777 0.308593451 979.971467 16.9493814 979.971467 50.2309573 951.148777 66.8717453 922.326087 50.2309573 922.326087 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-22)" points="893.503397 0.308593451 922.326087 16.9493814 922.326087 50.2309573 893.503397 66.8717453 864.680706 50.2309573 864.680706 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-22)" points="835.858016 0.308593451 864.680706 16.9493814 864.680706 50.2309573 835.858016 66.8717453 807.035326 50.2309573 807.035326 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-22)" points="778.212636 0.308593451 807.035326 16.9493814 807.035326 50.2309573 778.212636 66.8717453 749.389945 50.2309573 749.389945 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-22)" points="720.567255 0.308593451 749.389945 16.9493814 749.389945 50.2309573 720.567255 66.8717453 691.744565 50.2309573 691.744565 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-22)" points="662.921875 0.308593451 691.744565 16.9493814 691.744565 50.2309573 662.921875 66.8717453 634.099185 50.2309573 634.099185 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-22)" points="605.276494 0.308593451 634.099185 16.9493814 634.099185 50.2309573 605.276494 66.8717453 576.453804 50.2309573 576.453804 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-22)" points="547.631114 0.308593451 576.453804 16.9493814 576.453804 50.2309573 547.631114 66.8717453 518.808424 50.2309573 518.808424 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-22)" points="489.985734 0.308593451 518.808424 16.9493814 518.808424 50.2309573 489.985734 66.8717453 461.163043 50.2309573 461.163043 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-22)" points="432.340353 0.308593451 461.163043 16.9493814 461.163043 50.2309573 432.340353 66.8717453 403.517663 50.2309573 403.517663 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-22)" points="374.694973 0.308593451 403.517663 16.9493814 403.517663 50.2309573 374.694973 66.8717453 345.872283 50.2309573 345.872283 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-22)" points="317.049592 0.308593451 345.872283 16.9493814 345.872283 50.2309573 317.049592 66.8717453 288.226902 50.2309573 288.226902 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-22)" points="259.404212 0.308593451 288.226902 16.9493814 288.226902 50.2309573 259.404212 66.8717453 230.581522 50.2309573 230.581522 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-22)" points="201.758831 0.308593451 230.581522 16.9493814 230.581522 50.2309573 201.758831 66.8717453 172.936141 50.2309573 172.936141 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-22)" points="144.113451 0.308593451 172.936141 16.9493814 172.936141 50.2309573 144.113451 66.8717453 115.290761 50.2309573 115.290761 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-22)" points="86.4680706 0.308593451 115.290761 16.9493814 115.290761 50.2309573 86.4680706 66.8717453 57.6453804 50.2309573 57.6453804 16.9493814"></polygon>
-                            </g>
-                        </g>
-                    </g>
-                    <g id="Group-2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" mask="url(#mask-6)">
-                        <g transform="translate(0.000000, 600.472713)" id="Group">
-                            <g transform="translate(0.000000, 0.924454)">
-                                <mask id="mask-24" fill="white">
-                                    <use xlink:href="#path-23"></use>
-                                </mask>
-                                <g id="Duplicate-control"></g>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-24)" points="28.8226902 0.308593451 57.6453804 16.9493814 57.6453804 50.2309573 28.8226902 66.8717453 1.95399252e-13 50.2309573 1.76747506e-13 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-24)" points="951.148777 0.308593451 979.971467 16.9493814 979.971467 50.2309573 951.148777 66.8717453 922.326087 50.2309573 922.326087 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-24)" points="893.503397 0.308593451 922.326087 16.9493814 922.326087 50.2309573 893.503397 66.8717453 864.680706 50.2309573 864.680706 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-24)" points="835.858016 0.308593451 864.680706 16.9493814 864.680706 50.2309573 835.858016 66.8717453 807.035326 50.2309573 807.035326 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-24)" points="778.212636 0.308593451 807.035326 16.9493814 807.035326 50.2309573 778.212636 66.8717453 749.389945 50.2309573 749.389945 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-24)" points="720.567255 0.308593451 749.389945 16.9493814 749.389945 50.2309573 720.567255 66.8717453 691.744565 50.2309573 691.744565 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-24)" points="662.921875 0.308593451 691.744565 16.9493814 691.744565 50.2309573 662.921875 66.8717453 634.099185 50.2309573 634.099185 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-24)" points="605.276494 0.308593451 634.099185 16.9493814 634.099185 50.2309573 605.276494 66.8717453 576.453804 50.2309573 576.453804 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-24)" points="547.631114 0.308593451 576.453804 16.9493814 576.453804 50.2309573 547.631114 66.8717453 518.808424 50.2309573 518.808424 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-24)" points="489.985734 0.308593451 518.808424 16.9493814 518.808424 50.2309573 489.985734 66.8717453 461.163043 50.2309573 461.163043 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-24)" points="432.340353 0.308593451 461.163043 16.9493814 461.163043 50.2309573 432.340353 66.8717453 403.517663 50.2309573 403.517663 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-24)" points="374.694973 0.308593451 403.517663 16.9493814 403.517663 50.2309573 374.694973 66.8717453 345.872283 50.2309573 345.872283 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-24)" points="317.049592 0.308593451 345.872283 16.9493814 345.872283 50.2309573 317.049592 66.8717453 288.226902 50.2309573 288.226902 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-24)" points="259.404212 0.308593451 288.226902 16.9493814 288.226902 50.2309573 259.404212 66.8717453 230.581522 50.2309573 230.581522 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-24)" points="201.758831 0.308593451 230.581522 16.9493814 230.581522 50.2309573 201.758831 66.8717453 172.936141 50.2309573 172.936141 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-24)" points="144.113451 0.308593451 172.936141 16.9493814 172.936141 50.2309573 144.113451 66.8717453 115.290761 50.2309573 115.290761 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-24)" points="86.4680706 0.308593451 115.290761 16.9493814 115.290761 50.2309573 86.4680706 66.8717453 57.6453804 50.2309573 57.6453804 16.9493814"></polygon>
-                            </g>
-                            <g transform="translate(27.861934, 50.883783)">
-                                <mask id="mask-26" fill="white">
-                                    <use xlink:href="#path-25"></use>
-                                </mask>
-                                <g id="Duplicate-control"></g>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-26)" points="28.8226902 0.308593451 57.6453804 16.9493814 57.6453804 50.2309573 28.8226902 66.8717453 1.95399252e-13 50.2309573 1.76747506e-13 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-26)" points="951.148777 0.308593451 979.971467 16.9493814 979.971467 50.2309573 951.148777 66.8717453 922.326087 50.2309573 922.326087 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-26)" points="893.503397 0.308593451 922.326087 16.9493814 922.326087 50.2309573 893.503397 66.8717453 864.680706 50.2309573 864.680706 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-26)" points="835.858016 0.308593451 864.680706 16.9493814 864.680706 50.2309573 835.858016 66.8717453 807.035326 50.2309573 807.035326 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-26)" points="778.212636 0.308593451 807.035326 16.9493814 807.035326 50.2309573 778.212636 66.8717453 749.389945 50.2309573 749.389945 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-26)" points="720.567255 0.308593451 749.389945 16.9493814 749.389945 50.2309573 720.567255 66.8717453 691.744565 50.2309573 691.744565 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-26)" points="662.921875 0.308593451 691.744565 16.9493814 691.744565 50.2309573 662.921875 66.8717453 634.099185 50.2309573 634.099185 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-26)" points="605.276494 0.308593451 634.099185 16.9493814 634.099185 50.2309573 605.276494 66.8717453 576.453804 50.2309573 576.453804 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-26)" points="547.631114 0.308593451 576.453804 16.9493814 576.453804 50.2309573 547.631114 66.8717453 518.808424 50.2309573 518.808424 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-26)" points="489.985734 0.308593451 518.808424 16.9493814 518.808424 50.2309573 489.985734 66.8717453 461.163043 50.2309573 461.163043 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-26)" points="432.340353 0.308593451 461.163043 16.9493814 461.163043 50.2309573 432.340353 66.8717453 403.517663 50.2309573 403.517663 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-26)" points="374.694973 0.308593451 403.517663 16.9493814 403.517663 50.2309573 374.694973 66.8717453 345.872283 50.2309573 345.872283 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-26)" points="317.049592 0.308593451 345.872283 16.9493814 345.872283 50.2309573 317.049592 66.8717453 288.226902 50.2309573 288.226902 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-26)" points="259.404212 0.308593451 288.226902 16.9493814 288.226902 50.2309573 259.404212 66.8717453 230.581522 50.2309573 230.581522 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-26)" points="201.758831 0.308593451 230.581522 16.9493814 230.581522 50.2309573 201.758831 66.8717453 172.936141 50.2309573 172.936141 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-26)" points="144.113451 0.308593451 172.936141 16.9493814 172.936141 50.2309573 144.113451 66.8717453 115.290761 50.2309573 115.290761 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-26)" points="86.4680706 0.308593451 115.290761 16.9493814 115.290761 50.2309573 86.4680706 66.8717453 57.6453804 50.2309573 57.6453804 16.9493814"></polygon>
-                            </g>
-                        </g>
-                    </g>
-                    <g id="Group-2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" mask="url(#mask-6)">
-                        <g transform="translate(0.000000, 500.554053)" id="Group">
-                            <g transform="translate(0.000000, 0.924454)">
-                                <mask id="mask-28" fill="white">
-                                    <use xlink:href="#path-27"></use>
-                                </mask>
-                                <g id="Duplicate-control"></g>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-28)" points="28.8226902 0.308593451 57.6453804 16.9493814 57.6453804 50.2309573 28.8226902 66.8717453 1.95399252e-13 50.2309573 1.76747506e-13 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-28)" points="951.148777 0.308593451 979.971467 16.9493814 979.971467 50.2309573 951.148777 66.8717453 922.326087 50.2309573 922.326087 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-28)" points="893.503397 0.308593451 922.326087 16.9493814 922.326087 50.2309573 893.503397 66.8717453 864.680706 50.2309573 864.680706 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-28)" points="835.858016 0.308593451 864.680706 16.9493814 864.680706 50.2309573 835.858016 66.8717453 807.035326 50.2309573 807.035326 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-28)" points="778.212636 0.308593451 807.035326 16.9493814 807.035326 50.2309573 778.212636 66.8717453 749.389945 50.2309573 749.389945 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-28)" points="720.567255 0.308593451 749.389945 16.9493814 749.389945 50.2309573 720.567255 66.8717453 691.744565 50.2309573 691.744565 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-28)" points="662.921875 0.308593451 691.744565 16.9493814 691.744565 50.2309573 662.921875 66.8717453 634.099185 50.2309573 634.099185 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-28)" points="605.276494 0.308593451 634.099185 16.9493814 634.099185 50.2309573 605.276494 66.8717453 576.453804 50.2309573 576.453804 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-28)" points="547.631114 0.308593451 576.453804 16.9493814 576.453804 50.2309573 547.631114 66.8717453 518.808424 50.2309573 518.808424 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-28)" points="489.985734 0.308593451 518.808424 16.9493814 518.808424 50.2309573 489.985734 66.8717453 461.163043 50.2309573 461.163043 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-28)" points="432.340353 0.308593451 461.163043 16.9493814 461.163043 50.2309573 432.340353 66.8717453 403.517663 50.2309573 403.517663 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-28)" points="374.694973 0.308593451 403.517663 16.9493814 403.517663 50.2309573 374.694973 66.8717453 345.872283 50.2309573 345.872283 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-28)" points="317.049592 0.308593451 345.872283 16.9493814 345.872283 50.2309573 317.049592 66.8717453 288.226902 50.2309573 288.226902 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-28)" points="259.404212 0.308593451 288.226902 16.9493814 288.226902 50.2309573 259.404212 66.8717453 230.581522 50.2309573 230.581522 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-28)" points="201.758831 0.308593451 230.581522 16.9493814 230.581522 50.2309573 201.758831 66.8717453 172.936141 50.2309573 172.936141 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-28)" points="144.113451 0.308593451 172.936141 16.9493814 172.936141 50.2309573 144.113451 66.8717453 115.290761 50.2309573 115.290761 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-28)" points="86.4680706 0.308593451 115.290761 16.9493814 115.290761 50.2309573 86.4680706 66.8717453 57.6453804 50.2309573 57.6453804 16.9493814"></polygon>
-                            </g>
-                            <g transform="translate(27.861934, 50.883783)">
-                                <mask id="mask-30" fill="white">
-                                    <use xlink:href="#path-29"></use>
-                                </mask>
-                                <g id="Duplicate-control"></g>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-30)" points="28.8226902 0.308593451 57.6453804 16.9493814 57.6453804 50.2309573 28.8226902 66.8717453 1.95399252e-13 50.2309573 1.76747506e-13 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-30)" points="951.148777 0.308593451 979.971467 16.9493814 979.971467 50.2309573 951.148777 66.8717453 922.326087 50.2309573 922.326087 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-30)" points="893.503397 0.308593451 922.326087 16.9493814 922.326087 50.2309573 893.503397 66.8717453 864.680706 50.2309573 864.680706 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-30)" points="835.858016 0.308593451 864.680706 16.9493814 864.680706 50.2309573 835.858016 66.8717453 807.035326 50.2309573 807.035326 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-30)" points="778.212636 0.308593451 807.035326 16.9493814 807.035326 50.2309573 778.212636 66.8717453 749.389945 50.2309573 749.389945 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-30)" points="720.567255 0.308593451 749.389945 16.9493814 749.389945 50.2309573 720.567255 66.8717453 691.744565 50.2309573 691.744565 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-30)" points="662.921875 0.308593451 691.744565 16.9493814 691.744565 50.2309573 662.921875 66.8717453 634.099185 50.2309573 634.099185 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-30)" points="605.276494 0.308593451 634.099185 16.9493814 634.099185 50.2309573 605.276494 66.8717453 576.453804 50.2309573 576.453804 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-30)" points="547.631114 0.308593451 576.453804 16.9493814 576.453804 50.2309573 547.631114 66.8717453 518.808424 50.2309573 518.808424 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-30)" points="489.985734 0.308593451 518.808424 16.9493814 518.808424 50.2309573 489.985734 66.8717453 461.163043 50.2309573 461.163043 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-30)" points="432.340353 0.308593451 461.163043 16.9493814 461.163043 50.2309573 432.340353 66.8717453 403.517663 50.2309573 403.517663 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-30)" points="374.694973 0.308593451 403.517663 16.9493814 403.517663 50.2309573 374.694973 66.8717453 345.872283 50.2309573 345.872283 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-30)" points="317.049592 0.308593451 345.872283 16.9493814 345.872283 50.2309573 317.049592 66.8717453 288.226902 50.2309573 288.226902 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-30)" points="259.404212 0.308593451 288.226902 16.9493814 288.226902 50.2309573 259.404212 66.8717453 230.581522 50.2309573 230.581522 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-30)" points="201.758831 0.308593451 230.581522 16.9493814 230.581522 50.2309573 201.758831 66.8717453 172.936141 50.2309573 172.936141 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-30)" points="144.113451 0.308593451 172.936141 16.9493814 172.936141 50.2309573 144.113451 66.8717453 115.290761 50.2309573 115.290761 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-30)" points="86.4680706 0.308593451 115.290761 16.9493814 115.290761 50.2309573 86.4680706 66.8717453 57.6453804 50.2309573 57.6453804 16.9493814"></polygon>
-                            </g>
-                        </g>
-                    </g>
-                    <g id="Group-2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" mask="url(#mask-6)">
-                        <g transform="translate(0.000000, 400.635394)" id="Group">
-                            <g transform="translate(0.000000, 0.924454)">
-                                <mask id="mask-32" fill="white">
-                                    <use xlink:href="#path-31"></use>
-                                </mask>
-                                <g id="Duplicate-control"></g>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-32)" points="28.8226902 0.308593451 57.6453804 16.9493814 57.6453804 50.2309573 28.8226902 66.8717453 1.95399252e-13 50.2309573 1.76747506e-13 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-32)" points="951.148777 0.308593451 979.971467 16.9493814 979.971467 50.2309573 951.148777 66.8717453 922.326087 50.2309573 922.326087 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-32)" points="893.503397 0.308593451 922.326087 16.9493814 922.326087 50.2309573 893.503397 66.8717453 864.680706 50.2309573 864.680706 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-32)" points="835.858016 0.308593451 864.680706 16.9493814 864.680706 50.2309573 835.858016 66.8717453 807.035326 50.2309573 807.035326 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-32)" points="778.212636 0.308593451 807.035326 16.9493814 807.035326 50.2309573 778.212636 66.8717453 749.389945 50.2309573 749.389945 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-32)" points="720.567255 0.308593451 749.389945 16.9493814 749.389945 50.2309573 720.567255 66.8717453 691.744565 50.2309573 691.744565 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-32)" points="662.921875 0.308593451 691.744565 16.9493814 691.744565 50.2309573 662.921875 66.8717453 634.099185 50.2309573 634.099185 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-32)" points="605.276494 0.308593451 634.099185 16.9493814 634.099185 50.2309573 605.276494 66.8717453 576.453804 50.2309573 576.453804 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-32)" points="547.631114 0.308593451 576.453804 16.9493814 576.453804 50.2309573 547.631114 66.8717453 518.808424 50.2309573 518.808424 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-32)" points="489.985734 0.308593451 518.808424 16.9493814 518.808424 50.2309573 489.985734 66.8717453 461.163043 50.2309573 461.163043 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-32)" points="432.340353 0.308593451 461.163043 16.9493814 461.163043 50.2309573 432.340353 66.8717453 403.517663 50.2309573 403.517663 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-32)" points="374.694973 0.308593451 403.517663 16.9493814 403.517663 50.2309573 374.694973 66.8717453 345.872283 50.2309573 345.872283 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-32)" points="317.049592 0.308593451 345.872283 16.9493814 345.872283 50.2309573 317.049592 66.8717453 288.226902 50.2309573 288.226902 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-32)" points="259.404212 0.308593451 288.226902 16.9493814 288.226902 50.2309573 259.404212 66.8717453 230.581522 50.2309573 230.581522 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-32)" points="201.758831 0.308593451 230.581522 16.9493814 230.581522 50.2309573 201.758831 66.8717453 172.936141 50.2309573 172.936141 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-32)" points="144.113451 0.308593451 172.936141 16.9493814 172.936141 50.2309573 144.113451 66.8717453 115.290761 50.2309573 115.290761 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-32)" points="86.4680706 0.308593451 115.290761 16.9493814 115.290761 50.2309573 86.4680706 66.8717453 57.6453804 50.2309573 57.6453804 16.9493814"></polygon>
-                            </g>
-                            <g transform="translate(27.861934, 50.883783)">
-                                <mask id="mask-34" fill="white">
-                                    <use xlink:href="#path-33"></use>
-                                </mask>
-                                <g id="Duplicate-control"></g>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-34)" points="28.8226902 0.308593451 57.6453804 16.9493814 57.6453804 50.2309573 28.8226902 66.8717453 1.95399252e-13 50.2309573 1.76747506e-13 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-34)" points="951.148777 0.308593451 979.971467 16.9493814 979.971467 50.2309573 951.148777 66.8717453 922.326087 50.2309573 922.326087 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-34)" points="893.503397 0.308593451 922.326087 16.9493814 922.326087 50.2309573 893.503397 66.8717453 864.680706 50.2309573 864.680706 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-34)" points="835.858016 0.308593451 864.680706 16.9493814 864.680706 50.2309573 835.858016 66.8717453 807.035326 50.2309573 807.035326 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-34)" points="778.212636 0.308593451 807.035326 16.9493814 807.035326 50.2309573 778.212636 66.8717453 749.389945 50.2309573 749.389945 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-34)" points="720.567255 0.308593451 749.389945 16.9493814 749.389945 50.2309573 720.567255 66.8717453 691.744565 50.2309573 691.744565 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-34)" points="662.921875 0.308593451 691.744565 16.9493814 691.744565 50.2309573 662.921875 66.8717453 634.099185 50.2309573 634.099185 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-34)" points="605.276494 0.308593451 634.099185 16.9493814 634.099185 50.2309573 605.276494 66.8717453 576.453804 50.2309573 576.453804 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-34)" points="547.631114 0.308593451 576.453804 16.9493814 576.453804 50.2309573 547.631114 66.8717453 518.808424 50.2309573 518.808424 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-34)" points="489.985734 0.308593451 518.808424 16.9493814 518.808424 50.2309573 489.985734 66.8717453 461.163043 50.2309573 461.163043 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-34)" points="432.340353 0.308593451 461.163043 16.9493814 461.163043 50.2309573 432.340353 66.8717453 403.517663 50.2309573 403.517663 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-34)" points="374.694973 0.308593451 403.517663 16.9493814 403.517663 50.2309573 374.694973 66.8717453 345.872283 50.2309573 345.872283 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-34)" points="317.049592 0.308593451 345.872283 16.9493814 345.872283 50.2309573 317.049592 66.8717453 288.226902 50.2309573 288.226902 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-34)" points="259.404212 0.308593451 288.226902 16.9493814 288.226902 50.2309573 259.404212 66.8717453 230.581522 50.2309573 230.581522 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-34)" points="201.758831 0.308593451 230.581522 16.9493814 230.581522 50.2309573 201.758831 66.8717453 172.936141 50.2309573 172.936141 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-34)" points="144.113451 0.308593451 172.936141 16.9493814 172.936141 50.2309573 144.113451 66.8717453 115.290761 50.2309573 115.290761 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-34)" points="86.4680706 0.308593451 115.290761 16.9493814 115.290761 50.2309573 86.4680706 66.8717453 57.6453804 50.2309573 57.6453804 16.9493814"></polygon>
-                            </g>
-                        </g>
-                    </g>
-                    <g id="Group-2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" mask="url(#mask-6)">
-                        <g transform="translate(0.000000, 299.755978)" id="Group">
-                            <g transform="translate(0.000000, 0.924454)">
-                                <mask id="mask-36" fill="white">
-                                    <use xlink:href="#path-35"></use>
-                                </mask>
-                                <g id="Duplicate-control"></g>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-36)" points="28.8226902 0.308593451 57.6453804 16.9493814 57.6453804 50.2309573 28.8226902 66.8717453 1.95399252e-13 50.2309573 1.76747506e-13 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-36)" points="951.148777 0.308593451 979.971467 16.9493814 979.971467 50.2309573 951.148777 66.8717453 922.326087 50.2309573 922.326087 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-36)" points="893.503397 0.308593451 922.326087 16.9493814 922.326087 50.2309573 893.503397 66.8717453 864.680706 50.2309573 864.680706 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-36)" points="835.858016 0.308593451 864.680706 16.9493814 864.680706 50.2309573 835.858016 66.8717453 807.035326 50.2309573 807.035326 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-36)" points="778.212636 0.308593451 807.035326 16.9493814 807.035326 50.2309573 778.212636 66.8717453 749.389945 50.2309573 749.389945 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-36)" points="720.567255 0.308593451 749.389945 16.9493814 749.389945 50.2309573 720.567255 66.8717453 691.744565 50.2309573 691.744565 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-36)" points="662.921875 0.308593451 691.744565 16.9493814 691.744565 50.2309573 662.921875 66.8717453 634.099185 50.2309573 634.099185 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-36)" points="605.276494 0.308593451 634.099185 16.9493814 634.099185 50.2309573 605.276494 66.8717453 576.453804 50.2309573 576.453804 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-36)" points="547.631114 0.308593451 576.453804 16.9493814 576.453804 50.2309573 547.631114 66.8717453 518.808424 50.2309573 518.808424 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-36)" points="489.985734 0.308593451 518.808424 16.9493814 518.808424 50.2309573 489.985734 66.8717453 461.163043 50.2309573 461.163043 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-36)" points="432.340353 0.308593451 461.163043 16.9493814 461.163043 50.2309573 432.340353 66.8717453 403.517663 50.2309573 403.517663 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-36)" points="374.694973 0.308593451 403.517663 16.9493814 403.517663 50.2309573 374.694973 66.8717453 345.872283 50.2309573 345.872283 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-36)" points="317.049592 0.308593451 345.872283 16.9493814 345.872283 50.2309573 317.049592 66.8717453 288.226902 50.2309573 288.226902 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-36)" points="259.404212 0.308593451 288.226902 16.9493814 288.226902 50.2309573 259.404212 66.8717453 230.581522 50.2309573 230.581522 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-36)" points="201.758831 0.308593451 230.581522 16.9493814 230.581522 50.2309573 201.758831 66.8717453 172.936141 50.2309573 172.936141 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-36)" points="144.113451 0.308593451 172.936141 16.9493814 172.936141 50.2309573 144.113451 66.8717453 115.290761 50.2309573 115.290761 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-36)" points="86.4680706 0.308593451 115.290761 16.9493814 115.290761 50.2309573 86.4680706 66.8717453 57.6453804 50.2309573 57.6453804 16.9493814"></polygon>
-                            </g>
-                            <g transform="translate(27.861934, 50.883783)">
-                                <mask id="mask-38" fill="white">
-                                    <use xlink:href="#path-37"></use>
-                                </mask>
-                                <g id="Duplicate-control"></g>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-38)" points="28.8226902 0.308593451 57.6453804 16.9493814 57.6453804 50.2309573 28.8226902 66.8717453 1.95399252e-13 50.2309573 1.76747506e-13 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-38)" points="951.148777 0.308593451 979.971467 16.9493814 979.971467 50.2309573 951.148777 66.8717453 922.326087 50.2309573 922.326087 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-38)" points="893.503397 0.308593451 922.326087 16.9493814 922.326087 50.2309573 893.503397 66.8717453 864.680706 50.2309573 864.680706 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-38)" points="835.858016 0.308593451 864.680706 16.9493814 864.680706 50.2309573 835.858016 66.8717453 807.035326 50.2309573 807.035326 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-38)" points="778.212636 0.308593451 807.035326 16.9493814 807.035326 50.2309573 778.212636 66.8717453 749.389945 50.2309573 749.389945 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-38)" points="720.567255 0.308593451 749.389945 16.9493814 749.389945 50.2309573 720.567255 66.8717453 691.744565 50.2309573 691.744565 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-38)" points="662.921875 0.308593451 691.744565 16.9493814 691.744565 50.2309573 662.921875 66.8717453 634.099185 50.2309573 634.099185 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-38)" points="605.276494 0.308593451 634.099185 16.9493814 634.099185 50.2309573 605.276494 66.8717453 576.453804 50.2309573 576.453804 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-38)" points="547.631114 0.308593451 576.453804 16.9493814 576.453804 50.2309573 547.631114 66.8717453 518.808424 50.2309573 518.808424 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-38)" points="489.985734 0.308593451 518.808424 16.9493814 518.808424 50.2309573 489.985734 66.8717453 461.163043 50.2309573 461.163043 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-38)" points="432.340353 0.308593451 461.163043 16.9493814 461.163043 50.2309573 432.340353 66.8717453 403.517663 50.2309573 403.517663 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-38)" points="374.694973 0.308593451 403.517663 16.9493814 403.517663 50.2309573 374.694973 66.8717453 345.872283 50.2309573 345.872283 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-38)" points="317.049592 0.308593451 345.872283 16.9493814 345.872283 50.2309573 317.049592 66.8717453 288.226902 50.2309573 288.226902 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-38)" points="259.404212 0.308593451 288.226902 16.9493814 288.226902 50.2309573 259.404212 66.8717453 230.581522 50.2309573 230.581522 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-38)" points="201.758831 0.308593451 230.581522 16.9493814 230.581522 50.2309573 201.758831 66.8717453 172.936141 50.2309573 172.936141 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-38)" points="144.113451 0.308593451 172.936141 16.9493814 172.936141 50.2309573 144.113451 66.8717453 115.290761 50.2309573 115.290761 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-38)" points="86.4680706 0.308593451 115.290761 16.9493814 115.290761 50.2309573 86.4680706 66.8717453 57.6453804 50.2309573 57.6453804 16.9493814"></polygon>
-                            </g>
-                        </g>
-                    </g>
-                    <g id="Group-2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" mask="url(#mask-6)">
-                        <g transform="translate(0.000000, 199.837319)" id="Group">
-                            <g transform="translate(0.000000, 0.924454)">
-                                <mask id="mask-40" fill="white">
-                                    <use xlink:href="#path-39"></use>
-                                </mask>
-                                <g id="Duplicate-control"></g>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-40)" points="28.8226902 0.308593451 57.6453804 16.9493814 57.6453804 50.2309573 28.8226902 66.8717453 1.91846539e-13 50.2309573 1.73194792e-13 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-40)" points="951.148777 0.308593451 979.971467 16.9493814 979.971467 50.2309573 951.148777 66.8717453 922.326087 50.2309573 922.326087 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-40)" points="893.503397 0.308593451 922.326087 16.9493814 922.326087 50.2309573 893.503397 66.8717453 864.680706 50.2309573 864.680706 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-40)" points="835.858016 0.308593451 864.680706 16.9493814 864.680706 50.2309573 835.858016 66.8717453 807.035326 50.2309573 807.035326 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-40)" points="778.212636 0.308593451 807.035326 16.9493814 807.035326 50.2309573 778.212636 66.8717453 749.389945 50.2309573 749.389945 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-40)" points="720.567255 0.308593451 749.389945 16.9493814 749.389945 50.2309573 720.567255 66.8717453 691.744565 50.2309573 691.744565 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-40)" points="662.921875 0.308593451 691.744565 16.9493814 691.744565 50.2309573 662.921875 66.8717453 634.099185 50.2309573 634.099185 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-40)" points="605.276494 0.308593451 634.099185 16.9493814 634.099185 50.2309573 605.276494 66.8717453 576.453804 50.2309573 576.453804 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-40)" points="547.631114 0.308593451 576.453804 16.9493814 576.453804 50.2309573 547.631114 66.8717453 518.808424 50.2309573 518.808424 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-40)" points="489.985734 0.308593451 518.808424 16.9493814 518.808424 50.2309573 489.985734 66.8717453 461.163043 50.2309573 461.163043 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-40)" points="432.340353 0.308593451 461.163043 16.9493814 461.163043 50.2309573 432.340353 66.8717453 403.517663 50.2309573 403.517663 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-40)" points="374.694973 0.308593451 403.517663 16.9493814 403.517663 50.2309573 374.694973 66.8717453 345.872283 50.2309573 345.872283 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-40)" points="317.049592 0.308593451 345.872283 16.9493814 345.872283 50.2309573 317.049592 66.8717453 288.226902 50.2309573 288.226902 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-40)" points="259.404212 0.308593451 288.226902 16.9493814 288.226902 50.2309573 259.404212 66.8717453 230.581522 50.2309573 230.581522 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-40)" points="201.758831 0.308593451 230.581522 16.9493814 230.581522 50.2309573 201.758831 66.8717453 172.936141 50.2309573 172.936141 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-40)" points="144.113451 0.308593451 172.936141 16.9493814 172.936141 50.2309573 144.113451 66.8717453 115.290761 50.2309573 115.290761 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-40)" points="86.4680706 0.308593451 115.290761 16.9493814 115.290761 50.2309573 86.4680706 66.8717453 57.6453804 50.2309573 57.6453804 16.9493814"></polygon>
-                            </g>
-                            <g transform="translate(27.861934, 50.883783)">
-                                <mask id="mask-42" fill="white">
-                                    <use xlink:href="#path-41"></use>
-                                </mask>
-                                <g id="Duplicate-control"></g>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-42)" points="28.8226902 0.308593451 57.6453804 16.9493814 57.6453804 50.2309573 28.8226902 66.8717453 1.95399252e-13 50.2309573 1.76747506e-13 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-42)" points="951.148777 0.308593451 979.971467 16.9493814 979.971467 50.2309573 951.148777 66.8717453 922.326087 50.2309573 922.326087 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-42)" points="893.503397 0.308593451 922.326087 16.9493814 922.326087 50.2309573 893.503397 66.8717453 864.680706 50.2309573 864.680706 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-42)" points="835.858016 0.308593451 864.680706 16.9493814 864.680706 50.2309573 835.858016 66.8717453 807.035326 50.2309573 807.035326 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-42)" points="778.212636 0.308593451 807.035326 16.9493814 807.035326 50.2309573 778.212636 66.8717453 749.389945 50.2309573 749.389945 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-42)" points="720.567255 0.308593451 749.389945 16.9493814 749.389945 50.2309573 720.567255 66.8717453 691.744565 50.2309573 691.744565 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-42)" points="662.921875 0.308593451 691.744565 16.9493814 691.744565 50.2309573 662.921875 66.8717453 634.099185 50.2309573 634.099185 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-42)" points="605.276494 0.308593451 634.099185 16.9493814 634.099185 50.2309573 605.276494 66.8717453 576.453804 50.2309573 576.453804 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-42)" points="547.631114 0.308593451 576.453804 16.9493814 576.453804 50.2309573 547.631114 66.8717453 518.808424 50.2309573 518.808424 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-42)" points="489.985734 0.308593451 518.808424 16.9493814 518.808424 50.2309573 489.985734 66.8717453 461.163043 50.2309573 461.163043 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-42)" points="432.340353 0.308593451 461.163043 16.9493814 461.163043 50.2309573 432.340353 66.8717453 403.517663 50.2309573 403.517663 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-42)" points="374.694973 0.308593451 403.517663 16.9493814 403.517663 50.2309573 374.694973 66.8717453 345.872283 50.2309573 345.872283 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-42)" points="317.049592 0.308593451 345.872283 16.9493814 345.872283 50.2309573 317.049592 66.8717453 288.226902 50.2309573 288.226902 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-42)" points="259.404212 0.308593451 288.226902 16.9493814 288.226902 50.2309573 259.404212 66.8717453 230.581522 50.2309573 230.581522 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-42)" points="201.758831 0.308593451 230.581522 16.9493814 230.581522 50.2309573 201.758831 66.8717453 172.936141 50.2309573 172.936141 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-42)" points="144.113451 0.308593451 172.936141 16.9493814 172.936141 50.2309573 144.113451 66.8717453 115.290761 50.2309573 115.290761 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-42)" points="86.4680706 0.308593451 115.290761 16.9493814 115.290761 50.2309573 86.4680706 66.8717453 57.6453804 50.2309573 57.6453804 16.9493814"></polygon>
-                            </g>
-                        </g>
-                    </g>
-                    <g id="Group-2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" mask="url(#mask-6)">
-                        <g transform="translate(0.000000, 99.918659)" id="Group">
-                            <g transform="translate(0.000000, 0.924454)">
-                                <mask id="mask-44" fill="white">
-                                    <use xlink:href="#path-43"></use>
-                                </mask>
-                                <g id="Duplicate-control"></g>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-44)" points="28.8226902 0.308593451 57.6453804 16.9493814 57.6453804 50.2309573 28.8226902 66.8717453 1.95399252e-13 50.2309573 1.76747506e-13 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-44)" points="951.148777 0.308593451 979.971467 16.9493814 979.971467 50.2309573 951.148777 66.8717453 922.326087 50.2309573 922.326087 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-44)" points="893.503397 0.308593451 922.326087 16.9493814 922.326087 50.2309573 893.503397 66.8717453 864.680706 50.2309573 864.680706 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-44)" points="835.858016 0.308593451 864.680706 16.9493814 864.680706 50.2309573 835.858016 66.8717453 807.035326 50.2309573 807.035326 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-44)" points="778.212636 0.308593451 807.035326 16.9493814 807.035326 50.2309573 778.212636 66.8717453 749.389945 50.2309573 749.389945 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-44)" points="720.567255 0.308593451 749.389945 16.9493814 749.389945 50.2309573 720.567255 66.8717453 691.744565 50.2309573 691.744565 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-44)" points="662.921875 0.308593451 691.744565 16.9493814 691.744565 50.2309573 662.921875 66.8717453 634.099185 50.2309573 634.099185 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-44)" points="605.276494 0.308593451 634.099185 16.9493814 634.099185 50.2309573 605.276494 66.8717453 576.453804 50.2309573 576.453804 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-44)" points="547.631114 0.308593451 576.453804 16.9493814 576.453804 50.2309573 547.631114 66.8717453 518.808424 50.2309573 518.808424 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-44)" points="489.985734 0.308593451 518.808424 16.9493814 518.808424 50.2309573 489.985734 66.8717453 461.163043 50.2309573 461.163043 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-44)" points="432.340353 0.308593451 461.163043 16.9493814 461.163043 50.2309573 432.340353 66.8717453 403.517663 50.2309573 403.517663 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-44)" points="374.694973 0.308593451 403.517663 16.9493814 403.517663 50.2309573 374.694973 66.8717453 345.872283 50.2309573 345.872283 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-44)" points="317.049592 0.308593451 345.872283 16.9493814 345.872283 50.2309573 317.049592 66.8717453 288.226902 50.2309573 288.226902 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-44)" points="259.404212 0.308593451 288.226902 16.9493814 288.226902 50.2309573 259.404212 66.8717453 230.581522 50.2309573 230.581522 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-44)" points="201.758831 0.308593451 230.581522 16.9493814 230.581522 50.2309573 201.758831 66.8717453 172.936141 50.2309573 172.936141 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-44)" points="144.113451 0.308593451 172.936141 16.9493814 172.936141 50.2309573 144.113451 66.8717453 115.290761 50.2309573 115.290761 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-44)" points="86.4680706 0.308593451 115.290761 16.9493814 115.290761 50.2309573 86.4680706 66.8717453 57.6453804 50.2309573 57.6453804 16.9493814"></polygon>
-                            </g>
-                            <g transform="translate(27.861934, 50.883783)">
-                                <mask id="mask-46" fill="white">
-                                    <use xlink:href="#path-45"></use>
-                                </mask>
-                                <g id="Duplicate-control"></g>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-46)" points="28.8226902 0.308593451 57.6453804 16.9493814 57.6453804 50.2309573 28.8226902 66.8717453 1.95399252e-13 50.2309573 1.76747506e-13 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-46)" points="951.148777 0.308593451 979.971467 16.9493814 979.971467 50.2309573 951.148777 66.8717453 922.326087 50.2309573 922.326087 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-46)" points="893.503397 0.308593451 922.326087 16.9493814 922.326087 50.2309573 893.503397 66.8717453 864.680706 50.2309573 864.680706 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-46)" points="835.858016 0.308593451 864.680706 16.9493814 864.680706 50.2309573 835.858016 66.8717453 807.035326 50.2309573 807.035326 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-46)" points="778.212636 0.308593451 807.035326 16.9493814 807.035326 50.2309573 778.212636 66.8717453 749.389945 50.2309573 749.389945 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-46)" points="720.567255 0.308593451 749.389945 16.9493814 749.389945 50.2309573 720.567255 66.8717453 691.744565 50.2309573 691.744565 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-46)" points="662.921875 0.308593451 691.744565 16.9493814 691.744565 50.2309573 662.921875 66.8717453 634.099185 50.2309573 634.099185 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-46)" points="605.276494 0.308593451 634.099185 16.9493814 634.099185 50.2309573 605.276494 66.8717453 576.453804 50.2309573 576.453804 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-46)" points="547.631114 0.308593451 576.453804 16.9493814 576.453804 50.2309573 547.631114 66.8717453 518.808424 50.2309573 518.808424 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-46)" points="489.985734 0.308593451 518.808424 16.9493814 518.808424 50.2309573 489.985734 66.8717453 461.163043 50.2309573 461.163043 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-46)" points="432.340353 0.308593451 461.163043 16.9493814 461.163043 50.2309573 432.340353 66.8717453 403.517663 50.2309573 403.517663 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-46)" points="374.694973 0.308593451 403.517663 16.9493814 403.517663 50.2309573 374.694973 66.8717453 345.872283 50.2309573 345.872283 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-46)" points="317.049592 0.308593451 345.872283 16.9493814 345.872283 50.2309573 317.049592 66.8717453 288.226902 50.2309573 288.226902 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-46)" points="259.404212 0.308593451 288.226902 16.9493814 288.226902 50.2309573 259.404212 66.8717453 230.581522 50.2309573 230.581522 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-46)" points="201.758831 0.308593451 230.581522 16.9493814 230.581522 50.2309573 201.758831 66.8717453 172.936141 50.2309573 172.936141 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-46)" points="144.113451 0.308593451 172.936141 16.9493814 172.936141 50.2309573 144.113451 66.8717453 115.290761 50.2309573 115.290761 16.9493814"></polygon>
-                                <polygon id="Polygon" stroke="#999999" mask="url(#mask-46)" points="86.4680706 0.308593451 115.290761 16.9493814 115.290761 50.2309573 86.4680706 66.8717453 57.6453804 50.2309573 57.6453804 16.9493814"></polygon>
-                            </g>
-                        </g>
-                    </g>
-                </g>
-            </g>
-            <mask id="mask-48" fill="white">
-                <use xlink:href="#path-47"></use>
-            </mask>
-            <use id="Combined-Shape" fill="#F1F1F1" xlink:href="#path-47"></use>
-            <mask id="mask-50" fill="white">
-                <use xlink:href="#path-49"></use>
-            </mask>
-            <use id="Combined-Shape" fill="#F1F1F1" transform="translate(727.481851, 509.351425) rotate(-180.000000) translate(-727.481851, -509.351425) " xlink:href="#path-49"></use>
-            <circle id="Oval-2" fill="#FFC231" cx="512.387624" cy="512.387624" r="135.118088"></circle>
-            <path d="M691.584224,554.79626 L741.584224,554.79626 L741.584224,848.113106 L691.584224,848.113106 L691.584224,554.79626 Z M691.584224,668.27622 L707.760695,668.27622 L707.760695,848.113106 L691.584224,848.113106 L691.584224,668.27622 Z M725.407754,668.27622 L741.584224,668.27622 L741.584224,848.113106 L725.407754,848.113106 L725.407754,668.27622 Z" id="Combined-Shape" fill="#FFC231" transform="translate(716.584224, 701.454683) rotate(133.000000) translate(-716.584224, -701.454683) "></path>
-            <path d="M288.802242,169.956176 L338.802242,169.956176 L338.802242,463.273022 L288.802242,463.273022 L288.802242,169.956176 Z M288.802242,283.436136 L304.978713,283.436136 L304.978713,463.273022 L288.802242,463.273022 L288.802242,283.436136 Z M322.625772,283.436136 L338.802242,283.436136 L338.802242,463.273022 L322.625772,463.273022 L322.625772,283.436136 Z" id="Combined-Shape" fill="#FFC231" transform="translate(313.802242, 316.614599) scale(-1, -1) rotate(133.000000) translate(-313.802242, -316.614599) "></path>
-            <path d="M816.093378,100.047294 C731.060203,37.1735645 625.871277,0 512,0 C398.30327,0 293.262295,37.0596891 208.297793,99.7583476 L404.58707,301.155391 C436.776006,284.750117 473.221118,275.499672 511.826788,275.499672 C550.704585,275.499672 587.391258,284.880988 619.746562,301.503373 L816.093378,100.047294 Z" id="Combined-Shape" fill="#F1F1F1"></path>
-            <path d="M816.093378,823.047294 C731.060203,760.173564 625.871277,723 512,723 C398.30327,723 293.262295,760.059689 208.297793,822.758348 L404.58707,1024.15539 C436.776006,1007.75012 473.221118,998.499672 511.826788,998.499672 C550.704585,998.499672 587.391258,1007.88099 619.746562,1024.50337 L816.093378,823.047294 Z" id="Combined-Shape" fill="#F1F1F1" transform="translate(512.195585, 873.751687) scale(1, -1) translate(-512.195585, -873.751687) "></path>
-            <use id="Grid-Mask" stroke="#FFC231" mask="url(#mask-52)" stroke-width="40" xlink:href="#path-51"></use>
-        </g>
-    </g>
-</svg>
--- a/Logo/Thumbs.db
+++ b/Logo/Thumbs.db
--- a/NzbDrone.sln.DotSettings
+++ b/NzbDrone.sln.DotSettings
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/Environment/ExternalSources/Decompiler/DecompileMethodBodies/@EntryValue">True</s:Boolean></wpf:ResourceDictionary>
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,38 +0,0 @@
-version: '0.2.0.{build}'
-
-branches:
-  only:
-  - develop
-
-assembly_info:
-  patch: true
-  file: 'src\NzbDrone.Common\Properties\SharedAssemblyInfo.cs'
-  assembly_version: '{version}'
-  assembly_file_version: '{version}'
-  assembly_informational_version: '{version}-rc1'
-
-environment:
-  DOTNET_CLI_TELEMETRY_OPTOUT: 1
-
-install:
-  - git submodule update --init --recursive
-
-build_script:
-  - ps: ./build-appveyor.ps1
-
-test: off
-# test:
-#   assemblies:
-#     - '_tests\*Test.dll'
-#   categories:
-#     except:
-#       - IntegrationTest
-#       - AutomationTest
-
-artifacts:
-  - path: '_artifacts\*.zip'
-  - path: '_artifacts\*.tar.gz'
-
-cache:
-  - '%USERPROFILE%\.nuget\packages'
-  - node_modules
--- a/build-appveyor.cake
+++ b/build-appveyor.cake
@@ -1,303 +0,0 @@
-#addin "Cake.Npm"
-#addin "SharpZipLib"
-#addin "Cake.Compression"
-
-// Build variables
-var outputFolder = "./_output";
-var outputFolderMono = outputFolder + "_mono";
-var outputFolderOsx = outputFolder + "_osx";
-var outputFolderOsxApp = outputFolderOsx + "_app";
-var testPackageFolder = "./_tests";
-var testSearchPattern = "*.Test/bin/x86/Release";
-var sourceFolder = "./src";
-var solutionFile = sourceFolder + "/NzbDrone.sln";
-var updateFolder = outputFolder + "/NzbDrone.Update";
-var updateFolderMono = outputFolderMono + "/NzbDrone.Update";
-
-// Artifact variables
-var artifactsFolder = "./_artifacts";
-var artifactsFolderWindows = artifactsFolder + "/windows";
-var artifactsFolderLinux = artifactsFolder + "/linux";
-var artifactsFolderOsx = artifactsFolder + "/osx";
-var artifactsFolderOsxApp = artifactsFolder + "/osx-app";
-
-// Utility methods
-public void RemoveEmptyFolders(string startLocation) {
-    foreach (var directory in System.IO.Directory.GetDirectories(startLocation))
-    {
-        RemoveEmptyFolders(directory);
-
-        if (System.IO.Directory.GetFiles(directory).Length == 0 && 
-            System.IO.Directory.GetDirectories(directory).Length == 0)
-        {
-            DeleteDirectory(directory, false);
-        }
-    }
-}
-
-public void CleanFolder(string path, bool keepConfigFiles) {
-	DeleteFiles(path + "/**/*.transform");
-
-	if (!keepConfigFiles) {
-		DeleteFiles(path + "/**/*.dll.config");
-	}
-
-	DeleteFiles(path + "/**/FluentValidation.resources.dll");
-	DeleteFiles(path + "/**/App.config");
-
-	DeleteFiles(path + "/**/*.less");
-
-	DeleteFiles(path + "/**/*.vshost.exe");
-
-	DeleteFiles(path + "/**/*.dylib");
-
-	RemoveEmptyFolders(path);
-}
-
-public void CreateMdbs(string path) {
-	foreach (var file in System.IO.Directory.EnumerateFiles(path, "*.pdb", System.IO.SearchOption.AllDirectories)) {
-		var actualFile = file.Substring(0, file.Length - 4);
-		
-		if (FileExists(actualFile + ".exe")) {
-			StartProcess("./tools/pdb2mdb/pdb2mdb.exe", new ProcessSettings()
-				.WithArguments(args => args.Append(actualFile + ".exe")));
-		}
-		
-		if (FileExists(actualFile + ".dll")) {
-			StartProcess("./tools/pdb2mdb/pdb2mdb.exe", new ProcessSettings()
-				.WithArguments(args => args.Append(actualFile + ".dll")));
-		}
-	}
-}
-
-// Build Tasks
-Task("Compile").Does(() => {
-	// Build
-	if (DirectoryExists(outputFolder)) {
-		DeleteDirectory(outputFolder, true);
-	}
-
-	MSBuild(solutionFile, config => 
-		config.UseToolVersion(MSBuildToolVersion.VS2015)
-			.WithTarget("Clean")
-			.SetVerbosity(Verbosity.Minimal));
-
-	NuGetRestore(solutionFile);
-
-	MSBuild(solutionFile, config => 
-		config.UseToolVersion(MSBuildToolVersion.VS2015)
-			.SetPlatformTarget(PlatformTarget.x86)
-			.SetConfiguration("Release")
-			.WithProperty("AllowedReferenceRelatedFileExtensions", new string[] { ".pdb" })
-			.WithTarget("Build")
-			.SetVerbosity(Verbosity.Minimal));
-
-	CleanFolder(outputFolder, false);
-
-	// Add JsonNet
-	DeleteFiles(outputFolder + "/Newtonsoft.Json.*");
-	CopyFiles(sourceFolder + "/packages/Newtonsoft.Json.*/lib/net35/*.dll", outputFolder);
-	CopyFiles(sourceFolder + "/packages/Newtonsoft.Json.*/lib/net35/*.dll", updateFolder);
-
-	// Remove Mono stuff
-	DeleteFile(outputFolder + "/Mono.Posix.dll");
-});
-
-Task("Gulp").Does(() => {
-	Npm
-		.WithLogLevel(NpmLogLevel.Silent)
-		.FromPath(".")
-			.Install()
-			.RunScript("build");
-});
-
-Task("PackageMono").Does(() => {
-	// Start mono package
-	if (DirectoryExists(outputFolderMono)) {
-		DeleteDirectory(outputFolderMono, true);
-	}
-
-	CopyDirectory(outputFolder, outputFolderMono);
-
-	// Create MDBs
-	CreateMdbs(outputFolderMono);
-
-	// Remove PDBs
-	DeleteFiles(outputFolderMono + "/**/*.pdb");
-
-	// Remove service helpers
-	DeleteFiles(outputFolderMono + "/ServiceUninstall.*");
-	DeleteFiles(outputFolderMono + "/ServiceInstall.*");
-	
-	// Remove native windows binaries
-	DeleteFiles(outputFolderMono + "/sqlite3.*");
-	DeleteFiles(outputFolderMono + "/MediaInfo.*");
-
-	// Adding NzbDrone.Core.dll.config (for dllmap)
-	CopyFile(sourceFolder + "/NzbDrone.Core/NzbDrone.Core.dll.config", outputFolderMono + "/NzbDrone.Core.dll.config");
-
-	// Adding CurlSharp.dll.config (for dllmap)
-	CopyFile(sourceFolder + "/NzbDrone.Common/CurlSharp.dll.config", outputFolderMono + "/CurlSharp.dll.config");
-
-	// Renaming Radarr.Console.exe to Radarr.exe
-	DeleteFiles(outputFolderMono + "/Radarr.exe*");
-	MoveFile(outputFolderMono + "/Radarr.Console.exe", outputFolderMono + "/Radarr.exe");
-	MoveFile(outputFolderMono + "/Radarr.Console.exe.config", outputFolderMono + "/Radarr.exe.config");
-	MoveFile(outputFolderMono + "/Radarr.Console.exe.mdb", outputFolderMono + "/Radarr.exe.mdb");
-
-	// Remove NzbDrone.Windows.*
-	DeleteFiles(outputFolderMono + "/NzbDrone.Windows.*");
-
-	// Adding NzbDrone.Mono to updatePackage
-	CopyFiles(outputFolderMono + "/NzbDrone.Mono.*", updateFolderMono);
-});
-
-Task("PackageOsx").Does(() => {
-	// Start osx package
-	if (DirectoryExists(outputFolderOsx)) {
-		DeleteDirectory(outputFolderOsx, true);
-	}
-
-	CopyDirectory(outputFolderMono, outputFolderOsx);
-
-	// Adding sqlite dylibs
-	CopyFiles(sourceFolder + "/Libraries/Sqlite/*.dylib", outputFolderOsx);
-
-	// Adding MediaInfo dylib
-	CopyFiles(sourceFolder + "/Libraries/MediaInfo/*.dylib", outputFolderOsx);
-
-	// Adding Startup script
-	CopyFile("./osx/Sonarr", outputFolderOsx + "/Sonarr");
-});
-
-Task("PackageOsxApp").Does(() => {
-	// Start osx app package
-	if (DirectoryExists(outputFolderOsxApp)) {
-		DeleteDirectory(outputFolderOsxApp, true);
-	}
-
-	CreateDirectory(outputFolderOsxApp);
-
-	// Copy osx package files
-	CopyDirectory("./osx/Radarr.app", outputFolderOsxApp + "/Radarr.app");
-	CopyDirectory(outputFolderOsx, outputFolderOsxApp + "/Radarr.app/Contents/MacOS");
-});
-
-Task("PackageTests").Does(() => {
-	// Start tests package
-	if (DirectoryExists(testPackageFolder)) {
-		DeleteDirectory(testPackageFolder, true);
-	}
-
-	CreateDirectory(testPackageFolder);
-
-	// Copy tests
-	CopyFiles(sourceFolder + "/" + testSearchPattern + "/*", testPackageFolder);
-	foreach (var directory in System.IO.Directory.GetDirectories(sourceFolder, "*.Test")) {
-		var releaseDirectory = directory + "/bin/x86/Release";
-		if (DirectoryExists(releaseDirectory)) {
-			foreach (var releaseSubDirectory in System.IO.Directory.GetDirectories(releaseDirectory)) {
-				Information(System.IO.Path.GetDirectoryName(releaseSubDirectory));
-				CopyDirectory(releaseSubDirectory, testPackageFolder + "/" + System.IO.Path.GetFileName(releaseSubDirectory));
-			}
-		}
-	}
-
-	// Install NUnit.ConsoleRunner
-	NuGetInstall("NUnit.ConsoleRunner", new NuGetInstallSettings {
-		Version = "3.2.0",
-		OutputDirectory = testPackageFolder
-	});
-
-	// Copy dlls
-	CopyFiles(outputFolder + "/*.dll", testPackageFolder);
-	
-	// Copy scripts
-	CopyFiles("./*.sh", testPackageFolder);
-
-	// Create MDBs for tests
-	CreateMdbs(testPackageFolder);
-
-	// Remove config
-	DeleteFiles(testPackageFolder + "/*.log.config");
-
-	// Clean
-	CleanFolder(testPackageFolder, true);
-
-	// Adding NzbDrone.Core.dll.config (for dllmap)
-	CopyFile(sourceFolder + "/NzbDrone.Core/NzbDrone.Core.dll.config", testPackageFolder + "/NzbDrone.Core.dll.config");
-
-	// Adding CurlSharp.dll.config (for dllmap)
-	CopyFile(sourceFolder + "/NzbDrone.Common/CurlSharp.dll.config", testPackageFolder + "/CurlSharp.dll.config");
-
-	// Adding CurlSharp libraries
-	CopyFiles(sourceFolder + "/ExternalModules/CurlSharp/libs/i386/*", testPackageFolder);
-});
-
-Task("CleanupWindowsPackage").Does(() => {
-	// Remove mono
-	DeleteFiles(outputFolder + "/NzbDrone.Mono.*");
-
-	// Adding NzbDrone.Windows to updatePackage
-	CopyFiles(outputFolder + "/NzbDrone.Windows.*", updateFolder);
-});
-
-Task("Build")
-	.IsDependentOn("Compile")
-	.IsDependentOn("Gulp")
-	.IsDependentOn("PackageMono")
-	.IsDependentOn("PackageOsx")
-	.IsDependentOn("PackageOsxApp")
-	.IsDependentOn("PackageTests")
-	.IsDependentOn("CleanupWindowsPackage");
-
-// Build Artifacts
-Task("CleanArtifacts").Does(() => {
-	if (DirectoryExists(artifactsFolder)) {
-		DeleteDirectory(artifactsFolder, true);
-	}
-
-	CreateDirectory(artifactsFolder);
-});
-
-Task("ArtifactsWindows").Does(() => {
-	CopyDirectory(outputFolder, artifactsFolderWindows + "/Radarr");
-});
-
-Task("ArtifactsLinux").Does(() => {
-	CopyDirectory(outputFolderMono, artifactsFolderLinux + "/Radarr");
-});
-
-Task("ArtifactsOsx").Does(() => {
-	CopyDirectory(outputFolderOsx, artifactsFolderOsx + "/Radarr");
-});
-
-Task("ArtifactsOsxApp").Does(() => {
-	CopyDirectory(outputFolderOsxApp, artifactsFolderOsxApp);
-});
-
-Task("CompressArtifacts").Does(() => {
-	var prefix = "";
-
-	if (AppVeyor.IsRunningOnAppVeyor) {
-		prefix += AppVeyor.Environment.Repository.Branch + ".";
-		prefix += AppVeyor.Environment.Build.Version + ".";
-	}
-
-	Zip(artifactsFolderWindows, artifactsFolder + "/Radarr." + prefix + "windows.zip");
-	GZipCompress(artifactsFolderLinux, artifactsFolder + "/Radarr." + prefix + "linux.tar.gz");
-	GZipCompress(artifactsFolderOsx, artifactsFolder + "/Radarr." + prefix + "osx.tar.gz");
-	Zip(artifactsFolderOsxApp, artifactsFolder + "/Radarr." + prefix + "osx-app.zip");
-});
-
-Task("Artifacts")
-	.IsDependentOn("CleanArtifacts")
-	.IsDependentOn("ArtifactsWindows")
-	.IsDependentOn("ArtifactsLinux")
-	.IsDependentOn("ArtifactsOsx")
-	.IsDependentOn("ArtifactsOsxApp")
-	.IsDependentOn("CompressArtifacts");
-
-// Run
-RunTarget("Build");
-RunTarget("Artifacts");
--- a/build-appveyor.ps1
+++ b/build-appveyor.ps1
@@ -1,184 +0,0 @@
-##########################################################################
-# This is the Cake bootstrapper script for PowerShell.
-# This file was downloaded from https://github.com/cake-build/resources
-# Feel free to change this file to fit your needs.
-##########################################################################
-
-<#
-.SYNOPSIS
-This is a Powershell script to bootstrap a Cake build.
-.DESCRIPTION
-This Powershell script will download NuGet if missing, restore NuGet tools (including Cake)
-and execute your Cake build script with the parameters you provide.
-.PARAMETER Script
-The build script to execute.
-.PARAMETER Target
-The build script target to run.
-.PARAMETER Configuration
-The build configuration to use.
-.PARAMETER Verbosity
-Specifies the amount of information to be displayed.
-.PARAMETER Experimental
-Tells Cake to use the latest Roslyn release.
-.PARAMETER WhatIf
-Performs a dry run of the build script.
-No tasks will be executed.
-.PARAMETER Mono
-Tells Cake to use the Mono scripting engine.
-.PARAMETER SkipToolPackageRestore
-Skips restoring of packages.
-.PARAMETER ScriptArgs
-Remaining arguments are added here.
-.LINK
-http://cakebuild.net
-#>
-
-[CmdletBinding()]
-Param(
-    [string]$Script = "build-appveyor.cake",
-    [string]$Target = "Default",
-    [ValidateSet("Release", "Debug")]
-    [string]$Configuration = "Release",
-    [ValidateSet("Quiet", "Minimal", "Normal", "Verbose", "Diagnostic")]
-    [string]$Verbosity = "Verbose",
-    [switch]$Experimental,
-    [Alias("DryRun","Noop")]
-    [switch]$WhatIf,
-    [switch]$Mono,
-    [switch]$SkipToolPackageRestore,
-    [Parameter(Position=0,Mandatory=$false,ValueFromRemainingArguments=$true)]
-    [string[]]$ScriptArgs
-)
-
-[Reflection.Assembly]::LoadWithPartialName("System.Security") | Out-Null
-function MD5HashFile([string] $filePath)
-{
-    if ([string]::IsNullOrEmpty($filePath) -or !(Test-Path $filePath -PathType Leaf))
-    {
-        return $null
-    }
-
-    [System.IO.Stream] $file = $null;
-    [System.Security.Cryptography.MD5] $md5 = $null;
-    try
-    {
-        $md5 = [System.Security.Cryptography.MD5]::Create()
-        $file = [System.IO.File]::OpenRead($filePath)
-        return [System.BitConverter]::ToString($md5.ComputeHash($file))
-    }
-    finally
-    {
-        if ($file -ne $null)
-        {
-            $file.Dispose()
-        }
-    }
-}
-
-Write-Host "Preparing to run build script..."
-
-if(!$PSScriptRoot){
-    $PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent
-}
-
-$TOOLS_DIR = Join-Path $PSScriptRoot "tools-cake"
-$NUGET_EXE = Join-Path $TOOLS_DIR "nuget.exe"
-$CAKE_EXE = Join-Path $TOOLS_DIR "Cake/Cake.exe"
-$NUGET_URL = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
-$PACKAGES_CONFIG = Join-Path $TOOLS_DIR "packages.config"
-$PACKAGES_CONFIG_MD5 = Join-Path $TOOLS_DIR "packages.config.md5sum"
-
-# Should we use mono?
-$UseMono = "";
-if($Mono.IsPresent) {
-    Write-Verbose -Message "Using the Mono based scripting engine."
-    $UseMono = "-mono"
-}
-
-# Should we use the new Roslyn?
-$UseExperimental = "";
-if($Experimental.IsPresent -and !($Mono.IsPresent)) {
-    Write-Verbose -Message "Using experimental version of Roslyn."
-    $UseExperimental = "-experimental"
-}
-
-# Is this a dry run?
-$UseDryRun = "";
-if($WhatIf.IsPresent) {
-    $UseDryRun = "-dryrun"
-}
-
-# Make sure tools folder exists
-if ((Test-Path $PSScriptRoot) -and !(Test-Path $TOOLS_DIR)) {
-    Write-Verbose -Message "Creating tools directory..."
-    New-Item -Path $TOOLS_DIR -Type directory | out-null
-}
-
-# Make sure that packages.config exist.
-if (!(Test-Path $PACKAGES_CONFIG)) {
-    Write-Verbose -Message "Downloading packages.config..."
-    try { (New-Object System.Net.WebClient).DownloadFile("http://cakebuild.net/download/bootstrapper/packages", $PACKAGES_CONFIG) } catch {
-        Throw "Could not download packages.config."
-    }
-}
-
-# Try find NuGet.exe in path if not exists
-if (!(Test-Path $NUGET_EXE)) {
-    Write-Verbose -Message "Trying to find nuget.exe in PATH..."
-    $existingPaths = $Env:Path -Split ';' | Where-Object { (![string]::IsNullOrEmpty($_)) -and (Test-Path $_) }
-    $NUGET_EXE_IN_PATH = Get-ChildItem -Path $existingPaths -Filter "nuget.exe" | Select -First 1
-    if ($NUGET_EXE_IN_PATH -ne $null -and (Test-Path $NUGET_EXE_IN_PATH.FullName)) {
-        Write-Verbose -Message "Found in PATH at $($NUGET_EXE_IN_PATH.FullName)."
-        $NUGET_EXE = $NUGET_EXE_IN_PATH.FullName
-    }
-}
-
-# Try download NuGet.exe if not exists
-if (!(Test-Path $NUGET_EXE)) {
-    Write-Verbose -Message "Downloading NuGet.exe..."
-    try {
-        (New-Object System.Net.WebClient).DownloadFile($NUGET_URL, $NUGET_EXE)
-    } catch {
-        Throw "Could not download NuGet.exe."
-    }
-}
-
-# Save nuget.exe path to environment to be available to child processed
-$ENV:NUGET_EXE = $NUGET_EXE
-
-# Restore tools from NuGet?
-if(-Not $SkipToolPackageRestore.IsPresent) {
-    Push-Location
-    Set-Location $TOOLS_DIR
-
-    # Check for changes in packages.config and remove installed tools if true.
-    [string] $md5Hash = MD5HashFile($PACKAGES_CONFIG)
-    if((!(Test-Path $PACKAGES_CONFIG_MD5)) -Or
-      ($md5Hash -ne (Get-Content $PACKAGES_CONFIG_MD5 ))) {
-        Write-Verbose -Message "Missing or changed package.config hash..."
-        Remove-Item * -Recurse -Exclude packages.config,nuget.exe
-    }
-
-    Write-Verbose -Message "Restoring tools from NuGet..."
-    $NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$TOOLS_DIR`""
-
-    if ($LASTEXITCODE -ne 0) {
-        Throw "An error occured while restoring NuGet tools."
-    }
-    else
-    {
-        $md5Hash | Out-File $PACKAGES_CONFIG_MD5 -Encoding "ASCII"
-    }
-    Write-Verbose -Message ($NuGetOutput | out-string)
-    Pop-Location
-}
-
-# Make sure that Cake has been installed.
-if (!(Test-Path $CAKE_EXE)) {
-    Throw "Could not find Cake.exe at $CAKE_EXE"
-}
-
-# Start Cake
-Write-Host "Running build script..."
-Invoke-Expression "& `"$CAKE_EXE`" `"$Script`" -target=`"$Target`" -configuration=`"$Configuration`" -verbosity=`"$Verbosity`" $UseMono $UseDryRun $UseExperimental $ScriptArgs"
-exit $LASTEXITCODE
--- a/build.ps1
+++ b/build.ps1
@@ -1 +1,260 @@
-Write-Warning "DEPRECATED -- Please use build.sh instead."
+$msBuild = 'C:\Windows\Microsoft.NET\Framework64\v4.0.30319\msbuild.exe'
+$outputFolder = '.\_output'
+$outputFolderMono = '.\_output_mono'
+$outputFolderOsx = '.\_output_osx'
+$outputFolderOsxApp = '.\_output_osx_app'
+$testPackageFolder = '.\_tests\'
+$testSearchPattern = '*.Test\bin\x86\Release'
+$sourceFolder = '.\src'
+$updateFolder = $outputFolder + '\NzbDrone.Update'
+$updateFolderMono = $outputFolderMono + '\NzbDrone.Update'
+
+Function Build()
+{
+    Write-Host "##teamcity[progressStart 'Build']"
+
+    $clean = $msbuild + " src\nzbdrone.sln /t:Clean /m"
+    $build = $msbuild + " src\nzbdrone.sln /p:Configuration=Release /p:Platform=x86 /t:Build /m"
+
+    if(Test-Path $outputFolder)
+    {
+        Remove-Item -Recurse -Force $outputFolder -ErrorAction Continue
+    }
+
+    Invoke-Expression $clean
+    CheckExitCode
+
+    Invoke-Expression $build
+    CheckExitCode
+
+    CleanFolder $outputFolder
+
+    AddJsonNet
+
+    Write-Host "Removing Mono.Posix.dll"
+    Remove-Item "$outputFolder\Mono.Posix.dll"
+
+    Write-Host "##teamcity[progressFinish 'Build']"
+}
+
+Function CleanFolder($path, $keepConfigFiles)
+{
+    Write-Host Removing XMLDoc files
+    get-childitem $path -File -Filter *.xml -Recurse | foreach ($_) {
+
+        $filename = $_.FullName
+        $exeFilename = $filename -replace "xml", "exe"
+        $dllFilename = $filename -replace "xml", "dll"
+
+        if (Test-Path $exeFilename) {
+            remove-item $_.fullname
+        }
+
+        if (Test-Path $dllFilename) {
+            remove-item $_.fullname
+        }
+    }
+
+    get-childitem $path -File -Filter *.transform -Recurse | foreach ($_) {remove-item $_.fullname}
+
+    if($keepConfigFiles -ne $true)
+    {
+        get-childitem $path -File -Filter *.dll.config -Recurse | foreach ($_) {remove-item $_.fullname}
+    }
+
+    Write-Host Removing FluentValidation.Resources  files
+    get-childitem $path -File -Filter FluentValidation.resources.dll -recurse | foreach ($_) {remove-item $_.fullname}
+
+    get-childitem $path -File -Filter app.config -Recurse | foreach ($_) {remove-item $_.fullname}
+
+    Write-Host Removing .less files
+    get-childitem $path -File -Filter *.less -Recurse | foreach ($_) {remove-item $_.fullname}
+
+    Write-Host Removing vshost files
+    get-childitem $path -File -Filter *.vshost.exe -Recurse | foreach ($_) {remove-item $_.fullname}
+
+    if(Test-Path $$path\NuGet)
+    {
+        Write-Host Removing NuGet
+        Remove-Item -Recurse -Force "$path\NuGet"
+    }
+
+    Write-Host Removing Empty folders
+    while (Get-ChildItem $path -recurse | where {!@(Get-ChildItem -force $_.fullname)} | Test-Path)
+    {
+        Get-ChildItem $path -Directory -recurse | where {!@(Get-ChildItem -force $_.fullname)} | Remove-Item
+    }
+}
+
+Function PackageMono()
+{
+    Write-Host "##teamcity[progressStart 'Creating Mono Package']"
+
+    if(Test-Path $outputFolderMono)
+    {
+        Remove-Item -Recurse -Force $outputFolderMono -ErrorAction Continue
+    }
+
+    Copy-Item $outputFolder $outputFolderMono -recurse
+
+    Write-Host Creating MDBs
+    get-childitem $outputFolderMono -File -Include @("*.exe", "*.dll") -Exclude @("MediaInfo.dll", "sqlite3.dll") -Recurse | foreach ($_) {
+        Write-Host "Creating .mdb for $_"
+        & "tools\pdb2mdb\pdb2mdb.exe" $_.fullname
+    }
+
+    Write-Host Removing PDBs
+    get-childitem $outputFolderMono -File -Filter *.pdb -Recurse | foreach ($_) {remove-item $_.fullname}
+
+    Write-Host Removing Service helpers
+    get-childitem $outputFolderMono -File -Filter ServiceUninstall.* -Recurse | foreach ($_) {remove-item $_.fullname}
+    get-childitem $outputFolderMono -File -Filter ServiceInstall.* -Recurse | foreach ($_) {remove-item $_.fullname}
+
+    Write-Host Removing native windows binaries Sqlite, MediaInfo
+    get-childitem $outputFolderMono -File -Filter sqlite3.* -Recurse | foreach ($_) {remove-item $_.fullname}
+    get-childitem $outputFolderMono -File -Filter MediaInfo.* -Recurse | foreach ($_) {remove-item $_.fullname}
+
+    Write-Host "Adding MediaInfoDotNet.dll.config (for dllmap)"
+    Copy-Item "$sourceFolder\MediaInfoDotNet.dll.config" $outputFolderMono
+
+    Write-Host Renaming NzbDrone.Console.exe to NzbDrone.exe
+    Get-ChildItem $outputFolderMono -File -Filter "NzbDrone.exe*" -Recurse | foreach ($_) {remove-item $_.fullname}
+
+    Write-Host Removing NzbDrone.Windows
+    get-childitem $outputFolderMono -File -Filter NzbDrone.Windows.* -Recurse | foreach ($_) {remove-item $_.fullname}
+
+    Get-ChildItem $outputFolderMono -File -Filter "NzbDrone.Console.exe*" -Recurse | foreach ($_) {
+        $newName = $_.fullname -Replace ".Console",""
+
+        Rename-Item $_.fullname $newName
+    }
+
+    Write-Host Adding NzbDrone.Mono to UpdatePackage
+    Copy-Item $outputFolderMono\* $updateFolderMono -Filter NzbDrone.Mono.*
+
+    Write-Host "##teamcity[progressFinish 'Creating Mono Package']"
+}
+
+Function PackageOsx()
+{
+    Write-Host "##teamcity[progressStart 'Creating OS X Package']"
+
+    if(Test-Path $outputFolderOsx)
+    {
+        Remove-Item -Recurse -Force $outputFolderOsx -ErrorAction Continue
+    }
+
+    Copy-Item $outputFolderMono $outputFolderOsx -recurse
+
+    Write-Host "Adding sqlite dylibs"
+    Copy-Item "$sourceFolder\Libraries\sqlite\*.dylib" "$outputFolderOsx"
+
+    Write-Host "Adding MediaInfo dylib"
+    Copy-Item "$sourceFolder\Libraries\MediaInfo\*.dylib" "$outputFolderOsx"
+
+    Write-Host "Adding Startup script"
+    Copy-Item  .\osx\Sonarr "$outputFolderOsx"
+
+    Write-Host "##teamcity[progressFinish 'Creating OS X Package']"
+}
+
+
+Function PackageOsxApp()
+{
+    Write-Host "##teamcity[progressStart 'Creating OS X App Package']"
+
+    if(Test-Path $outputFolderOsxApp)
+    {
+        Remove-Item -Recurse -Force $outputFolderOsxApp -ErrorAction Continue
+    }
+
+    Copy-Item .\osx\Sonarr.app $outputFolderOsxApp\Sonarr.app -recurse
+    Copy-Item $outputFolderOsx $outputFolderOsxApp\Sonarr.app\Contents\MacOS -recurse
+
+    Write-Host "##teamcity[progressFinish 'Creating OS X App Package']"
+}
+
+Function AddJsonNet()
+{
+    get-childitem $outputFolder -File -Filter Newtonsoft.Json.* -Recurse | foreach ($_) {remove-item $_.fullname}
+    Copy-Item .\src\packages\Newtonsoft.Json.*.*\lib\net35\*.dll -Destination $outputFolder
+    Copy-Item .\src\packages\Newtonsoft.Json.*.*\lib\net35\*.dll -Destination $outputFolder\NzbDrone.Update
+}
+
+Function PackageTests()
+{
+
+    Write-Host Packaging Tests
+    Write-Host "##teamcity[progressStart 'Creating Test Package']"
+
+    if(Test-Path $testPackageFolder)
+    {
+        Remove-Item -Recurse -Force $testPackageFolder -ErrorAction Continue
+    }
+
+    Get-ChildItem -Recurse -Directory | Where-Object {$_.FullName -like $testSearchPattern} |  foreach($_){
+        Copy-Item -Recurse ($_.FullName + "\*")  $testPackageFolder -ErrorAction Ignore
+    }
+
+    .\src\.nuget\NuGet.exe install NUnit.Runners -Version 2.6.1 -Output $testPackageFolder
+
+    Copy-Item $outputFolder\*.dll -Destination $testPackageFolder -Force
+    Copy-Item $outputFolder\*.pdb -Destination $testPackageFolder -Force
+    Copy-Item .\*.sh              -Destination $testPackageFolder -Force
+
+    Write-Host Creating MDBs for tests
+    get-childitem $testPackageFolder -File -Include @("*.exe", "*.dll") -Exclude @("MediaInfo.dll", "sqlite3.dll") -Recurse | foreach ($_) {
+        Write-Host "Creating .mdb for $_"
+        & "tools\pdb2mdb\pdb2mdb.exe" $_.fullname
+    }
+
+    get-childitem $testPackageFolder -File -Filter *log.config | foreach ($_) {remove-item $_.fullname}
+
+    CleanFolder $testPackageFolder $true
+
+    Write-Host "Adding MediaInfoDotNet.dll.config (for dllmap)"
+    Copy-Item "$sourceFolder\MediaInfoDotNet.dll.config" -Destination $testPackageFolder -Force
+
+    Write-Host "##teamcity[progressFinish 'Creating Test Package']"
+}
+
+Function RunGulp()
+{
+   Write-Host "##teamcity[progressStart 'Running Gulp']"
+   $gulpPath = '.\node_modules\gulp\bin\gulp'
+   Invoke-Expression  'npm install'
+   CheckExitCode
+
+   Invoke-Expression  ('node ' + $gulpPath + ' build') -ErrorAction Continue -Verbose
+   CheckExitCode
+
+   Remove-Item $outputFolder\UI\build.txt -ErrorAction Continue
+
+   Write-Host "##teamcity[progressFinish 'Running Gulp']"
+}
+
+Function CheckExitCode()
+{
+        if ($lastexitcode -ne 0)
+        {
+            Write-Host $errorMessage
+            exit 1
+        }
+}
+
+Function CleanupWindowsPackage()
+{
+    Write-Host Removing NzbDrone.Mono
+    get-childitem $outputFolder -File -Filter NzbDrone.Mono.* -Recurse | foreach ($_) {remove-item $_.fullname}
+
+    Write-Host Adding NzbDrone.Windows to UpdatePackage
+    Copy-Item $outputFolder\* $updateFolder -Filter NzbDrone.Windows.*
+}
+
+Build
+RunGulp
+PackageMono
+PackageOsx
+PackageOsxApp
+PackageTests
+CleanupWindowsPackage
--- a/build.sh
+++ b/build.sh
@@ -1,265 +0,0 @@
-#! /bin/bash
-msBuild='/c/Program Files (x86)/MSBuild/14.0/Bin'
-outputFolder='./_output'
-outputFolderMono='./_output_mono'
-outputFolderOsx='./_output_osx'
-outputFolderOsxApp='./_output_osx_app'
-testPackageFolder='./_tests/'
-testSearchPattern='*.Test/bin/x86/Release'
-sourceFolder='./src'
-slnFile=$sourceFolder/NzbDrone.sln
-updateFolder=$outputFolder/NzbDrone.Update
-updateFolderMono=$outputFolderMono/NzbDrone.Update
-
-nuget='tools/nuget/nuget.exe';
-CheckExitCode()
-{
-    "$@"
-    local status=$?
-    if [ $status -ne 0 ]; then
-        echo "error with $1" >&2
-        exit 1
-    fi
-    return $status
-}
-
-CleanFolder()
-{
-    local path=$1
-    local keepConfigFiles=$2
-
-
-    find $path -name "*.transform" -exec rm "{}" \;
-
-    if [ $keepConfigFiles != true ] ; then
-        find $path -name "*.dll.config" -exec rm "{}" \;
-    fi
-
-    echo "Removing FluentValidation.Resources files"
-    find $path -name "FluentValidation.resources.dll" -exec rm "{}" \;
-    find $path -name "App.config" -exec rm "{}" \;
-
-    echo "Removing .less files"
-    find $path -name "*.less" -exec rm "{}" \;
-
-    echo "Removing vshost files"
-    find $path -name "*.vshost.exe" -exec rm "{}" \;
-
-    echo "Removing dylib files"
-    find $path -name "*.dylib" -exec rm "{}" \;
-
-    echo "Removing Empty folders"
-    find $path -depth -empty -type d -exec rm -r "{}" \;
-}
-
-
-
-AddJsonNet()
-{
-    rm $outputFolder/Newtonsoft.Json.*
-    cp $sourceFolder/packages/Newtonsoft.Json.*/lib/net35/*.dll $outputFolder
-    cp $sourceFolder/packages/Newtonsoft.Json.*/lib/net35/*.dll $outputFolder/NzbDrone.Update
-}
-
-BuildWithMSBuild()
-{
-    export PATH=$msBuild:$PATH
-    CheckExitCode MSBuild.exe $slnFile //t:Clean //m
-    $nuget restore $slnFile
-    CheckExitCode MSBuild.exe $slnFile //p:Configuration=Release //p:Platform=x86 //t:Build //m //p:AllowedReferenceRelatedFileExtensions=.pdb
-}
-
-BuildWithXbuild()
-{
-    export MONO_IOMAP=case
-    CheckExitCode xbuild /t:Clean $slnFile
-    mono $nuget restore $slnFile
-    CheckExitCode xbuild /p:Configuration=Release /p:Platform=x86 /t:Build /p:AllowedReferenceRelatedFileExtensions=.pdb $slnFile
-}
-
-Build()
-{
-    echo "##teamcity[progressStart 'Build']"
-
-    rm -rf $outputFolder
-
-    if [ $runtime = "dotnet" ] ; then
-        BuildWithMSBuild
-    else
-        BuildWithXbuild
-    fi
-
-    CleanFolder $outputFolder false
-
-    AddJsonNet
-
-    echo "Removing Mono.Posix.dll"
-    rm $outputFolder/Mono.Posix.dll
-
-    echo "##teamcity[progressFinish 'Build']"
-}
-
-RunGulp()
-{
-    echo "##teamcity[progressStart 'npm install']"
-    npm-cache install npm || CheckExitCode npm install
-    echo "##teamcity[progressFinish 'npm install']"
-
-    echo "##teamcity[progressStart 'Running gulp']"
-    CheckExitCode npm run build
-    echo "##teamcity[progressFinish 'Running gulp']"
-}
-
-CreateMdbs()
-{
-    local path=$1
-    if [ $runtime = "dotnet" ] ; then
-        local pdbFiles=( $(find $path -name "*.pdb") )
-        for filename in "${pdbFiles[@]}"
-        do
-          if [ -e ${filename%.pdb}.dll ]  ; then
-            tools/pdb2mdb/pdb2mdb.exe ${filename%.pdb}.dll
-          fi
-          if [ -e ${filename%.pdb}.exe ]  ; then
-            tools/pdb2mdb/pdb2mdb.exe ${filename%.pdb}.exe
-          fi
-        done
-    fi
-}
-
-PackageMono()
-{
-    echo "##teamcity[progressStart 'Creating Mono Package']"
-    rm -rf $outputFolderMono
-    cp -r $outputFolder $outputFolderMono
-
-    echo "Creating MDBs"
-    CreateMdbs $outputFolderMono
-
-    echo "Removing PDBs"
-    find $outputFolderMono -name "*.pdb" -exec rm "{}" \;
-
-    echo "Removing Service helpers"
-    rm -f $outputFolderMono/ServiceUninstall.*
-    rm -f $outputFolderMono/ServiceInstall.*
-
-    echo "Removing native windows binaries Sqlite, MediaInfo"
-    rm -f $outputFolderMono/sqlite3.*
-    rm -f $outputFolderMono/MediaInfo.*
-
-    echo "Adding NzbDrone.Core.dll.config (for dllmap)"
-    cp $sourceFolder/NzbDrone.Core/NzbDrone.Core.dll.config $outputFolderMono
-
-    echo "Adding CurlSharp.dll.config (for dllmap)"
-    cp $sourceFolder/NzbDrone.Common/CurlSharp.dll.config $outputFolderMono
-
-    echo "Renaming NzbDrone.Console.exe to NzbDrone.exe"
-    rm $outputFolderMono/Radarr.exe*
-    for file in $outputFolderMono/Radarr.Console.exe*; do
-        mv "$file" "${file//.Console/}"
-    done
-
-    echo "Removing NzbDrone.Windows"
-    rm $outputFolderMono/NzbDrone.Windows.*
-
-    echo "Adding NzbDrone.Mono to UpdatePackage"
-    cp $outputFolderMono/NzbDrone.Mono.* $updateFolderMono
-
-    echo "##teamcity[progressFinish 'Creating Mono Package']"
-}
-
-PackageOsx()
-{
-    echo "##teamcity[progressStart 'Creating OS X Package']"
-    rm -rf $outputFolderOsx
-    cp -r $outputFolderMono $outputFolderOsx
-
-    echo "Adding sqlite dylibs"
-    cp $sourceFolder/Libraries/Sqlite/*.dylib $outputFolderOsx
-
-    echo "Adding MediaInfo dylib"
-    cp $sourceFolder/Libraries/MediaInfo/*.dylib $outputFolderOsx
-
-    echo "Adding Startup script"
-    cp  ./osx/Sonarr $outputFolderOsx
-
-    echo "##teamcity[progressFinish 'Creating OS X Package']"
-}
-
-PackageOsxApp()
-{
-    echo "##teamcity[progressStart 'Creating OS X App Package']"
-    rm -rf $outputFolderOsxApp
-    mkdir $outputFolderOsxApp
-
-    cp -r ./osx/Radarr.app $outputFolderOsxApp
-    cp -r $outputFolderOsx $outputFolderOsxApp/Radarr.app/Contents/MacOS
-
-    echo "##teamcity[progressFinish 'Creating OS X App Package']"
-}
-
-PackageTests()
-{
-    echo "Packaging Tests"
-    echo "##teamcity[progressStart 'Creating Test Package']"
-    rm -rf $testPackageFolder
-    mkdir $testPackageFolder
-
-    find $sourceFolder -path $testSearchPattern -exec cp -r -u -T "{}" $testPackageFolder \;
-
-    if [ $runtime = "dotnet" ] ; then
-        $nuget install NUnit.ConsoleRunner -Version 3.2.0 -Output $testPackageFolder
-    else
-        mono $nuget install NUnit.ConsoleRunner -Version 3.2.0 -Output $testPackageFolder
-    fi
-
-    cp $outputFolder/*.dll $testPackageFolder
-    cp ./*.sh $testPackageFolder
-
-    echo "Creating MDBs for tests"
-    CreateMdbs $testPackageFolder
-
-    rm -f $testPackageFolder/*.log.config
-
-    CleanFolder $testPackageFolder true
-
-    echo "Adding NzbDrone.Core.dll.config (for dllmap)"
-    cp $sourceFolder/NzbDrone.Core/NzbDrone.Core.dll.config $testPackageFolder
-
-    echo "Adding CurlSharp.dll.config (for dllmap)"
-    cp $sourceFolder/NzbDrone.Common/CurlSharp.dll.config $testPackageFolder
-
-    echo "Copying CurlSharp libraries"
-    cp $sourceFolder/ExternalModules/CurlSharp/libs/i386/* $testPackageFolder
-
-    echo "##teamcity[progressFinish 'Creating Test Package']"
-}
-
-CleanupWindowsPackage()
-{
-    echo "Removing NzbDrone.Mono"
-    rm -f $outputFolder/NzbDrone.Mono.*
-
-    echo "Adding NzbDrone.Windows to UpdatePackage"
-    cp $outputFolder/NzbDrone.Windows.* $updateFolder
-}
-
-# Use mono or .net depending on OS
-case "$(uname -s)" in
-    CYGWIN*|MINGW32*|MINGW64*|MSYS*)
-        # on windows, use dotnet
-        runtime="dotnet"
-        ;;
-    *)
-        # otherwise use mono
-        runtime="mono"
-        ;;
-esac
-
-Build
-RunGulp
-PackageMono
-PackageOsx
-PackageOsxApp
-PackageTests
-CleanupWindowsPackage
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,7 @@ Upstream-Name: nzbdrone
 Source: https://github.com/Sonarr/Sonarr

 Files: *
-Copyright: 2010-2016 Sonarr <hello@sonarr.tv>
+Copyright: 2010-2014 Sonarr <hello@sonarr.tv>

 License: GPL-3.0+

--- a/gulp/build.js
+++ b/gulp/build.js
@@ -2,17 +2,12 @@ var gulp = require('gulp');
 var runSequence = require('run-sequence');

 require('./clean');
+require('./requirejs');
 require('./less');
 require('./handlebars');
 require('./copy');

-gulp.task('build', function() {
-    return runSequence('clean', [
-            'webpack',
-            'less',
-            'handlebars',
-            'copyHtml',
-            'copyContent',
-            'copyJs'
-        ]);
-});
+gulp.task('build', function () {
+    return  runSequence('clean',
+        ['requireJs', 'less', 'handlebars', 'copyIndex', 'copyContent']);
+});
--- a/gulp/clean.js
+++ b/gulp/clean.js
@@ -3,6 +3,6 @@ var del = require('del');

 var paths = require('./paths');

-gulp.task('clean', function(cb) {
-    del([paths.dest.root], cb);
+gulp.task('clean', function (cb) {
+	del([paths.dest.root], cb);
 });
--- a/gulp/copy.js
+++ b/gulp/copy.js
@@ -1,31 +1,23 @@
 var gulp = require('gulp');
 var print = require('gulp-print');
 var cache = require('gulp-cached');
-var livereload = require('gulp-livereload');

 var paths = require('./paths.js');

 gulp.task('copyJs', function () {
-  return gulp.src(
-    [
-      paths.src.root + 'polyfills.js',
-      paths.src.root + 'JsLibraries/handlebars.runtime.js'
-    ])
-    .pipe(cache('copyJs'))
-    .pipe(print())
-    .pipe(gulp.dest(paths.dest.root))
-    .pipe(livereload());
+    return gulp.src(paths.src.scripts)
+        .pipe(cache('copyJs'))
+        .pipe(print())
+        .pipe(gulp.dest(paths.dest.root));
 });

-gulp.task('copyHtml', function () {
-  return gulp.src(paths.src.html)
-    .pipe(cache('copyHtml'))
-    .pipe(gulp.dest(paths.dest.root))
-    .pipe(livereload());
+gulp.task('copyIndex', function () {
+    return gulp.src(paths.src.index)
+        .pipe(cache('copyIndex'))
+        .pipe(gulp.dest(paths.dest.root));
 });

 gulp.task('copyContent', function () {
-  return gulp.src([paths.src.content + '**/*.*', '!**/*.less'])
-    .pipe(gulp.dest(paths.dest.content))
-    .pipe(livereload());
-});
+    return gulp.src([paths.src.content + '**/*.*', '!**/*.less'])
+        .pipe(gulp.dest(paths.dest.content));
+});
--- a/gulp/errorHandler.js
+++ b/gulp/errorHandler.js
@@ -1,7 +1,7 @@
 module.exports = {
-    onError : function(error) {
+    onError:function (error) {
        //If you want details of the error in the console
        console.log(error.toString());
        this.emit('end');
    }
-};
+} 
--- a/gulp/gulpFile.js
+++ b/gulp/gulpFile.js
@@ -1,11 +1,12 @@
 require('./watch.js');
 require('./build.js');
 require('./clean.js');
+require('./requirejs.js');
 require('./jshint.js');
 require('./handlebars.js');
 require('./copy.js');
 require('./less.js');
 require('./stripBom.js');
 require('./imageMin.js');
-require('./webpack.js');
-require('./start.js');
+
+
--- a/gulp/handlebars.js
+++ b/gulp/handlebars.js
@@ -2,26 +2,23 @@ var gulp = require('gulp');
 var handlebars = require('gulp-handlebars');
 var declare = require('gulp-declare');
 var concat = require('gulp-concat');
+var wrapAmd = require('gulp-wrap-amd');
 var wrap = require("gulp-wrap");
-var livereload = require('gulp-livereload');
 var path = require('path');
 var streamqueue = require('streamqueue');
-var stripbom = require('gulp-stripbom');

 var paths = require('./paths.js');
+var bom = require('./pipelines/gulp-bom.js');

-gulp.task('handlebars', function() {
+gulp.task('handlebars', function () {

-    var coreStream = gulp.src([
-        paths.src.templates,
-        '!*/**/*Partial.*'
-    ])
-        .pipe(stripbom({ showLog : false }))
+    var coreStream = gulp.src([paths.src.templates, '!*/**/*Partial.*'])
+        .pipe(bom())
        .pipe(handlebars())
        .pipe(declare({
-            namespace   : 'T',
-            noRedeclare : true,
-            processName : function(filePath) {
+            namespace: 'T',
+            noRedeclare: true,
+            processName: function (filePath) {

                filePath = path.relative(paths.src.root, filePath);

@@ -33,12 +30,12 @@ gulp.task('handlebars', function() {
        }));

    var partialStream = gulp.src([paths.src.partials])
-        .pipe(stripbom({ showLog : false }))
+        .pipe(bom())
        .pipe(handlebars())
        .pipe(wrap('Handlebars.template(<%= contents %>)'))
        .pipe(wrap('Handlebars.registerPartial(<%= processPartialName(file.relative) %>, <%= contents %>)', {}, {
-            imports : {
-                processPartialName : function(fileName) {
+            imports: {
+                processPartialName: function (fileName) {
                    return JSON.stringify(
                        path.basename(fileName, '.js')
                    );
@@ -46,10 +43,15 @@ gulp.task('handlebars', function() {
            }
        }));

-    return streamqueue({ objectMode : true },
+
+    return streamqueue({ objectMode: true },
        partialStream,
        coreStream
    ).pipe(concat('templates.js'))
-        .pipe(gulp.dest(paths.dest.root))
-        .pipe(livereload());
+        .pipe(wrapAmd({
+            deps: ['handlebars'],
+            params: ['Handlebars'],
+            exports: 'this["T"]'
+        }))
+        .pipe(gulp.dest(paths.dest.root));
 });
--- a/gulp/imageMin.js
+++ b/gulp/imageMin.js
@@ -2,13 +2,14 @@ var gulp = require('gulp');
 var print = require('gulp-print');
 var paths = require('./paths.js');

-gulp.task('imageMin', function() {
+
+gulp.task('imageMin', function () {
    var imagemin = require('gulp-imagemin');
    return gulp.src(paths.src.images)
        .pipe(imagemin({
-            progressive       : false,
-            optimizationLevel : 4,
-            svgoPlugins       : [{ removeViewBox : false }]
+            progressive: false,
+            optimizationLevel :4,
+            svgoPlugins: [{removeViewBox: false}]
        }))
        .pipe(print())
        .pipe(gulp.dest(paths.src.content + 'Images/'));
--- a/gulp/jshint.js
+++ b/gulp/jshint.js
@@ -4,12 +4,23 @@ var stylish = require('jshint-stylish');
 var cache = require('gulp-cached');
 var paths = require('./paths.js');

-gulp.task('jshint', function() {
-    return gulp.src([
-        paths.src.scripts,
-        paths.src.exclude.libs
-    ])
+
+gulp.task('jshint', function () {
+    return gulp.src([paths.src.scripts, paths.src.exclude.libs])
        .pipe(cache('jshint'))
-        .pipe(jshint())
+        .pipe(jshint({
+            '-W030': false,
+            '-W064': false,
+            '-W097': false, //Use the function form of “use strict”
+            '-W100': false, //Silently deleted characters (in locales)
+            'undef': true,
+            'globals': {
+                'require': true,
+                'define': true,
+                'window': true,
+                'document': true,
+                'console': true
+            }
+        }))
        .pipe(jshint.reporter(stylish));
 });
--- a/gulp/less.js
+++ b/gulp/less.js
@@ -1,49 +1,33 @@
 var gulp = require('gulp');
-
 var less = require('gulp-less');
-var postcss = require('gulp-postcss');
-var sourcemaps = require('gulp-sourcemaps');
-var autoprefixer = require('autoprefixer-core');
-var livereload = require('gulp-livereload');
-
 var print = require('gulp-print');
+
 var paths = require('./paths');
 var errorHandler = require('./errorHandler');

-gulp.task('less', function() {
-
-    var src = [
-        paths.src.content + 'bootstrap.less',
-        paths.src.content + 'theme.less',
-        paths.src.content + 'overrides.less',
-        paths.src.root + 'Series/series.less',
-        paths.src.root + 'Activity/activity.less',
-        paths.src.root + 'AddSeries/addSeries.less',
-                paths.src.root + 'AddMovies/addMovies.less',
-        paths.src.root + 'Calendar/calendar.less',
-        paths.src.root + 'Cells/cells.less',
-        paths.src.root + 'ManualImport/manualimport.less',
-        paths.src.root + 'Settings/settings.less',
-        paths.src.root + 'System/Logs/logs.less',
-        paths.src.root + 'System/Update/update.less',
-        paths.src.root + 'System/Info/info.less',
-        paths.src.root + 'Movies/movies.less',
-
-    ];
-
-    return gulp.src(src)
+gulp.task('less', function () {
+    return  gulp.src([
+            paths.src.content + 'bootstrap.less',
+            paths.src.content + 'theme.less',
+            paths.src.content + 'overrides.less',
+            paths.src.root + 'Series/series.less',
+            paths.src.root + 'Activity/activity.less',
+            paths.src.root + 'AddSeries/addSeries.less',
+            paths.src.root + 'Calendar/calendar.less',
+            paths.src.root + 'Cells/cells.less',
+            paths.src.root + 'Settings/settings.less',
+            paths.src.root + 'System/Logs/logs.less',
+            paths.src.root + 'System/Update/update.less',
+            paths.src.root + 'System/Info/info.less',
+    ])
        .pipe(print())
-        .pipe(sourcemaps.init())
        .pipe(less({
-            dumpLineNumbers : 'false',
-            compress        : true,
-            yuicompress     : true,
-            ieCompat        : true,
-            strictImports   : true
+            dumpLineNumbers: 'false',
+            compress: true,
+            yuicompress: true,
+            ieCompat: true,
+            strictImports: true
        }))
-        .pipe(postcss([ autoprefixer({ browsers: ['last 2 versions'] }) ]))
        .on('error', errorHandler.onError)
-        .pipe(sourcemaps.write(paths.dest.content))
-        .pipe(gulp.dest(paths.dest.content))
-        .pipe(livereload());
+        .pipe(gulp.dest(paths.dest.content));
 });
--- a/gulp/paths.js
+++ b/gulp/paths.js
@@ -1,21 +1,19 @@
-var paths = {
-    src  : {
-        root      : './src/UI/',
-        templates : './src/UI/**/*.hbs',
-        html      : './src/UI/*.html',
-        partials  : './src/UI/**/*Partial.hbs',
-        scripts   : './src/UI/**/*.js',
-        less      : ['./src/UI/**/*.less'],
-        content   : './src/UI/Content/',
-        images    : './src/UI/Content/Images/**/*',
-        exclude   : {
-            libs : '!./src/UI/JsLibraries/**'
+module.exports = {
+    src: {
+        root: './src/UI/',
+        templates: './src/UI/**/*.hbs',
+        index: './src/UI/index.html',
+        partials: './src/UI/**/*Partial.hbs',
+        scripts: './src/UI/**/*.js',
+        less: ['./src/UI/**/*.less'],
+        content: './src/UI/Content/',
+        images: './src/UI/Content/Images/**/*',
+        exclude :{
+            libs:'!./src/UI/JsLibraries/**'
        }
    },
-    dest : {
-        root    : './_output/UI/',
-        content : './_output/UI/Content/'
+    dest: {
+        root: './_output/UI/',
+        content: './_output/UI/Content/'
    }
 };
-
-module.exports = paths;
--- a/gulp/pipelines/gulp-bom.js
+++ b/gulp/pipelines/gulp-bom.js
@@ -0,0 +1,4 @@
+var replace = require('gulp-replace');
+module.exports = function() {
+   return replace(/^\uFEFF/, '');
+};
--- a/gulp/requirejs.js
+++ b/gulp/requirejs.js
@@ -0,0 +1,32 @@
+var gulp = require('gulp');
+var requirejs = require('requirejs');
+var paths = require('./paths');
+
+require('./handlebars.js');
+require('./jshint.js');
+
+
+gulp.task('requireJs', ['jshint'], function (cb) {
+
+    var config = {
+        mainConfigFile: 'src/UI/app.js',
+        fileExclusionRegExp: /^.*\.(?!js$)[^.]+$/,
+        preserveLicenseComments: false,
+        dir: paths.dest.root,
+        optimize: 'none',
+        removeCombined: true,
+        inlineText: false,
+        keepBuildDir: true,
+        modules: [
+            {
+                name: 'app',
+                exclude: ['templates.js']
+            }
+        ]};
+
+    requirejs.optimize(config, function (buildResponse) {
+        console.log(buildResponse);
+        cb();
+    });
+
+});
--- a/gulp/start.js
+++ b/gulp/start.js
@@ -1,112 +0,0 @@
-// will download and run sonarr (server) in a non-windows enviroment
-// you can use this if you don't care about the server code and just want to work
-// with the web code.
-
-var http = require('http');
-var gulp = require('gulp');
-var fs = require('fs');
-var targz = require('tar.gz');
-var del = require('del');
-var print = require('gulp-print');
-var spawn = require('child_process').spawn;
-
-function download(url, dest, cb) {
-  console.log('Downloading ' + url + ' to ' + dest);
-  var file = fs.createWriteStream(dest);
-  var request = http.get(url, function (response) {
-    response.pipe(file);
-    file.on('finish', function () {
-      console.log('Download completed');
-      file.close(cb);
-    });
-  });
-}
-
-function getLatest(cb) {
-  var branch = 'develop';
-  process.argv.forEach(function (val) {
-    var branchMatch = /branch=([\S]*)/.exec(val);
-    if (branchMatch && branchMatch.length > 1) {
-      branch = branchMatch[1];
-    }
-  });
-
-  var url = 'http://services.sonarr.tv/v1/update/' + branch + '?os=osx';
-
-  console.log('Checking for latest version:', url);
-
-  http.get(url, function (res) {
-    var data = '';
-
-    res.on('data', function (chunk) {
-      data += chunk;
-    });
-
-    res.on('end', function () {
-      var updatePackage = JSON.parse(data).updatePackage;
-      console.log('Latest version available: ' + updatePackage.version + ' Release Date: ' + updatePackage.releaseDate);
-      cb(updatePackage);
-    });
-  }).on('error', function (e) {
-    console.log('problem with request: ' + e.message);
-  });
-}
-
-function extract(source, dest, cb) {
-  console.log('extracting download page to ' + dest);
-  new targz().extract(source, dest, function (err) {
-    if (err) {
-      console.log(err);
-    }
-    console.log('Update package extracted.');
-    cb();
-  });
-}
-
-gulp.task('getSonarr', function () {
-
-  //gulp.src('/Users/kayone/git/Sonarr/_start/2.0.0.3288/NzbDrone/*.*')
-  //  .pipe(print())
-  //  .pipe(gulp.dest('./_output
-
-  //return;
-  try {
-    fs.mkdirSync('./_start/');
-  } catch (e) {
-    if (e.code != 'EEXIST') {
-      throw e;
-    }
-  }
-
-  getLatest(function (package) {
-    var packagePath = "./_start/" + package.filename;
-    var dirName = "./_start/" + package.version;
-    download(package.url, packagePath, function () {
-      extract(packagePath, dirName, function () {
-        // clean old binaries
-        console.log('Cleaning old binaries');
-        del.sync(['./_output/*', '!./_output/UI/']);
-        console.log('copying binaries to target');
-        gulp.src(dirName + '/NzbDrone/*.*')
-          .pipe(gulp.dest('./_output/'));
-      });
-    });
-  });
-});
-
-gulp.task('startSonarr', function () {
-
-  var ls = spawn('mono', ['--debug', './_output/NzbDrone.exe']);
-
-  ls.stdout.on('data', function (data) {
-    process.stdout.write('' + data);
-  });
-
-  ls.stderr.on('data', function (data) {
-    process.stdout.write('' + data);
-  });
-
-  ls.on('close', function (code) {
-    console.log('child process exited with code ' + code);
-  });
-});
--- a/gulp/stripBom.js
+++ b/gulp/stripBom.js
@@ -1,18 +1,22 @@
 var gulp = require('gulp');
 var paths = require('./paths.js');
-var stripbom = require('gulp-stripbom');
+var bom = require('./pipelines/gulp-bom.js');
+var gulpPrint = require('gulp-print');
+

 var stripBom = function (dest) {
    gulp.src([paths.src.scripts, paths.src.exclude.libs])
-        .pipe(stripbom({ showLog: false }))
-        .pipe(gulp.dest(dest));
-
-    gulp.src(paths.src.less)
-        .pipe(stripbom({ showLog: false }))
+        .pipe(bom())
+        .pipe(gulpPrint(function (filepath) {
+            return "booming: " + filepath;
+        }))
        .pipe(gulp.dest(dest));

    gulp.src(paths.src.templates)
-        .pipe(stripbom({ showLog: false }))
+        .pipe(bom())
+        .pipe(gulpPrint(function (filepath) {
+            return "booming: " + filepath;
+        }))
        .pipe(gulp.dest(dest));
 };

--- a/gulp/watch.js
+++ b/gulp/watch.js
@@ -1,5 +1,6 @@
 var gulp = require('gulp');
-var livereload = require('gulp-livereload');
+//var livereload = require('gulp-livereload');
+

 var paths = require('./paths.js');

@@ -7,14 +8,23 @@ require('./jshint.js');
 require('./handlebars.js');
 require('./less.js');
 require('./copy.js');
-require('./webpack.js');

-gulp.task('watch', ['jshint', 'handlebars', 'less', 'copyHtml', 'copyContent', 'copyJs'], function () {
-  livereload.listen();
-  gulp.start('webpackWatch');
-  gulp.watch([paths.src.scripts, paths.src.exclude.libs], ['jshint', 'copyJs']);
-  gulp.watch(paths.src.templates, ['handlebars']);
-  gulp.watch([paths.src.less, paths.src.exclude.libs], ['less']);
-  gulp.watch([paths.src.html], ['copyHtml']);
-  gulp.watch([paths.src.content + '**/*.*', '!**/*.less'], ['copyContent']);
+
+gulp.task('watch', ['jshint', 'handlebars', 'less', 'copyJs','copyIndex', 'copyContent'], function () {
+    gulp.watch([paths.src.scripts, paths.src.exclude.libs], ['jshint', 'copyJs']);
+    gulp.watch(paths.src.templates, ['handlebars']);
+    gulp.watch([paths.src.less, paths.src.exclude.libs], ['less']);
+    gulp.watch([paths.src.index], ['copyIndex']);
+    gulp.watch([paths.src.content + '**/*.*', '!**/*.less'], ['copyContent']);
+});
+
+gulp.task('liveReload', ['jshint', 'handlebars', 'less', 'copyJs'], function () {
+    var server = livereload();
+    gulp.watch([
+        'app/**/*.js',
+        'app/**/*.css',
+        'app/index.html'
+    ]).on('change', function (file) {
+        server.changed(file.path);
+    });
 });
--- a/gulp/webpack.js
+++ b/gulp/webpack.js
@@ -1,13 +0,0 @@
-var gulp = require('gulp');
-var webpackStream = require('webpack-stream');
-var livereload = require('gulp-livereload');
-var webpackConfig = require('../webpack.config');
-
-gulp.task('webpack', function() {
-    return gulp.src('main.js').pipe(webpackStream(webpackConfig)).pipe(gulp.dest(''));
-});
-
-gulp.task('webpackWatch', function() {
-    webpackConfig.watch = true;
-    return gulp.src('main.js').pipe(webpackStream(webpackConfig)).pipe(gulp.dest('')).pipe(livereload());
-});
--- a/gulpFile.js
+++ b/gulpFile.js
@@ -1 +1 @@
-require('./gulp/gulpFile.js');
+require('./gulp/gulpfile.js');
--- a/integration_mono.sh
+++ b/integration_mono.sh
@@ -0,0 +1,7 @@
+EXCLUDE="-exclude:Windows -include:IntegrationTest"
+TESTDIR="."
+NUNIT="$TESTDIR/NUnit.Runners.2.6.1/tools/nunit-console-x86.exe"
+
+mono --debug $NUNIT $EXCLUDE -xml:NzbDrone.Api.Result.xml $TESTDIR/NzbDrone.Api.Test.dll
+mono --debug $NUNIT $EXCLUDE -xml:NzbDrone.Core.Result.xml $TESTDIR/NzbDrone.Core.Test.dll
+mono --debug $NUNIT $EXCLUDE -xml:NzbDrone.Integration.Result.xml $TESTDIR/NzbDrone.Integration.Test.dll
--- a/osx/Radarr.app/Contents/Resources/radarr.icns
+++ b/osx/Radarr.app/Contents/Resources/radarr.icns
--- a/osx/Sonarr
+++ b/osx/Sonarr
@@ -1,48 +1,31 @@
 #!/bin/sh
-
+ 
 #get the bundle's MacOS directory full path
 DIR=$(cd "$(dirname "$0")"; pwd)
-
+ 
 #change these values to match your app
-EXE_PATH="$DIR/Radarr.exe"
+EXE_PATH="$DIR/nzbdrone.exe"
 APPNAME="Sonarr"
-
+ 
 #set up environment
-if [[ -x '/opt/local/bin/mono' ]]; then
-    export PATH="/opt/local/bin:$PATH"
-fi
-
-export DYLD_FALLBACK_LIBRARY_PATH="$DIR"
-
-if [ -e /Library/Frameworks/Mono.framework ]; then
-	MONO_FRAMEWORK_PATH=/Library/Frameworks/Mono.framework/Versions/Current
-	export PATH="$MONO_FRAMEWORK_PATH/bin:$PATH"
-	export DYLD_FALLBACK_LIBRARY_PATH="$DYLD_FALLBACK_LIBRARY_PATH:$MONO_FRAMEWORK_PATH/lib"
-fi
-
-if [[ -f '/opt/local/lib/libsqlite3.0.dylib' ]]; then
-	export DYLD_FALLBACK_LIBRARY_PATH="/opt/local/lib:$DYLD_FALLBACK_LIBRARY_PATH"
-fi
-
-export DYLD_FALLBACK_LIBRARY_PATH="$DYLD_FALLBACK_LIBRARY_PATH:$HOME/lib:/usr/local/lib:/lib:/usr/lib"
-
+MONO_FRAMEWORK_PATH=/Library/Frameworks/Mono.framework/Versions/Current
+export DYLD_FALLBACK_LIBRARY_PATH="$DIR:$MONO_FRAMEWORK_PATH/lib:/lib:/usr/lib"
+export PATH="$MONO_FRAMEWORK_PATH/bin:$PATH"
+ 
 #mono version check
 REQUIRED_MAJOR=3
 REQUIRED_MINOR=10
-
+ 
 VERSION_TITLE="Cannot launch $APPNAME"
 VERSION_MSG="$APPNAME requires Mono Runtime Environment(MRE) $REQUIRED_MAJOR.$REQUIRED_MINOR or later."
 DOWNLOAD_URL="http://www.mono-project.com/download/#download-mac"
-
+ 
 MONO_VERSION="$(mono --version | grep 'Mono JIT compiler version ' |  cut -f5 -d\ )"
-# if [[ -o DEBUG ]]; then osascript -e "display dialog \"MONO_VERSION: $MONO_VERSION\""; fi
-
-
 MONO_VERSION_MAJOR="$(echo $MONO_VERSION | cut -f1 -d.)"
 MONO_VERSION_MINOR="$(echo $MONO_VERSION | cut -f2 -d.)"
 if [ -z "$MONO_VERSION" ] \
    || [ $MONO_VERSION_MAJOR -lt $REQUIRED_MAJOR ] \
-    || [ $MONO_VERSION_MAJOR -eq $REQUIRED_MAJOR -a $MONO_VERSION_MINOR -lt $REQUIRED_MINOR ]
+    || [ $MONO_VERSION_MAJOR -eq $REQUIRED_MAJOR -a $MONO_VERSION_MINOR -lt $REQUIRED_MINOR ] 
 then
    osascript \
    -e "set question to display dialog \"$VERSION_MSG\" with title \"$VERSION_TITLE\" buttons {\"Cancel\", \"Download...\"} default button 2" \
@@ -51,8 +34,8 @@ then
    echo "$VERSION_MSG"
    exit 1
 fi
-
+ 
 MONO_EXEC="exec mono --debug"
-
+ 
 #run app using mono
-$MONO_EXEC "$EXE_PATH"
+$MONO_EXEC "$EXE_PATH"
--- a/osx/Sonarr.app/Contents/Info.plist
+++ b/osx/Sonarr.app/Contents/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleExecutable</key>
 	<string>Sonarr</string>
 	<key>CFBundleIconFile</key>
-	<string>radarr.icns</string>
+	<string>sonarr.icns</string>
 	<key>CFBundleIdentifier</key>
 	<string>com.osx.sonarr.tv</string>
 	<key>CFBundleInfoDictionaryVersion</key>
--- a/osx/Sonarr.app/Contents/Resources/sonarr.icns
+++ b/osx/Sonarr.app/Contents/Resources/sonarr.icns
--- a/package.json
+++ b/package.json
@@ -1,46 +1,36 @@
 {
  "name": "Sonarr",
-  "version": "2.0.0",
+  "version": "0.0.0",
  "description": "Sonarr",
-  "main": "main.js",
+  "main": "index.js",
  "scripts": {
-    "build": "gulp build",
-    "start": "gulp watch"
+    "preinstall": ""
  },
  "repository": {
    "type": "git",
    "url": "git://github.com/Sonarr/Sonarr.git"
  },
  "author": "",
-  "license": "GPL-3.0",
+  "license": "BSD",
  "gitHead": "9ff7aa1bf7fe38c4c5bdb92f56c8ad556916ed67",
  "readmeFilename": "readme.md",
  "dependencies": {
-    "autoprefixer-core": "5.2.1",
-    "del": "1.2.0",
-    "gulp": "3.9.0",
-    "gulp-cached": "1.1.0",
-    "gulp-concat": "2.6.0",
+    "fs-extra": "0.12.0",
+    "gulp": "3.8.10",
+    "gulp-cached": "1.0.1",
+    "del": "0.1.3",
+    "gulp-concat": "2.4.2",
    "gulp-declare": "0.3.0",
-    "gulp-handlebars": "3.0.1",
-    "gulp-jshint": "1.11.2",
-    "gulp-less": "3.0.3",
-    "gulp-livereload": "3.8.0",
-    "gulp-postcss": "6.0.0",
+    "gulp-handlebars": "2.2.0",
+    "gulp-jshint": "1.9.0",
+    "gulp-less": "1.3.6",
    "gulp-print": "1.1.0",
-    "gulp-replace": "0.5.3",
-    "gulp-run": "1.6.8",
-    "gulp-sourcemaps": "1.5.2",
-    "gulp-stripbom": "1.0.4",
-    "gulp-webpack": "1.5.0",
-    "gulp-wrap": "0.11.0",
-    "handlebars": "3.0.3",
-    "jshint-loader": "0.8.3",
-    "jshint-stylish": "2.0.1",
-    "run-sequence": "1.1.1",
-    "streamqueue": "1.1.0",
-    "tar.gz": "0.1.1",
-    "webpack": "1.12.0",
-    "webpack-stream": "2.1.0"
+    "gulp-replace": "0.5.0",
+    "gulp-wrap": "0.5.0",
+    "gulp-wrap-amd": "0.3.1",
+    "jshint-stylish": "1.0.0",
+    "requirejs": "2.1.15",
+    "run-sequence": "1.0.2",
+    "streamqueue": "0.1.1"
  }
 }
--- a/package.sh
+++ b/package.sh
@@ -1,68 +0,0 @@
-if [ $# -eq 0 ]; then
-  if [ "$TRAVIS_PULL_REQUEST" != false ]; then
-    echo "Need to supply version argument" && exit;
-  fi
-fi
-
-# Use mono or .net depending on OS
-case "$(uname -s)" in
-    CYGWIN*|MINGW32*|MINGW64*|MSYS*)
-        # on windows, use dotnet
-        runtime="dotnet"
-        ;;
-    *)
-        # otherwise use mono
-        runtime="mono"
-        ;;
-esac
-
-if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
-  VERSION="`date +%H:%M:%S`"
-  YEAR="`date +%Y`"
-  MONTH="`date +%m`"
-  DAY="`date +%d`"
-else
-  VERSION=$1
-fi
-outputFolder='./_output'
-outputFolderMono='./_output_mono'
-outputFolderOsx='./_output_osx'
-outputFolderOsxApp='./_output_osx_app'
-
-tr -d "\r" < $outputFolderOsxApp/Radarr.app/Contents/MacOS/Sonarr > $outputFolderOsxApp/Radarr.app/Contents/MacOS/Sonarr2
-rm $outputFolderOsxApp/Radarr.app/Contents/MacOS/Sonarr
-chmod +x $outputFolderOsxApp/Radarr.app/Contents/MacOS/Sonarr2
-mv $outputFolderOsxApp/Radarr.app/Contents/MacOS/Sonarr2 $outputFolderOsxApp/Radarr.app/Contents/MacOS/Sonarr >& error.log
-
-cp -r $outputFolder/ Radarr_Windows_$VERSION
-cp -r $outputFolderMono/ Radarr_Mono_$VERSION
-cp -r $outputFolderOsxApp/ Radarr_OSX_$VERSION
-
-if [ $runtime = "dotnet" ] ; then
-  ./7za.exe a Radarr_Windows_$VERSION.zip ./Radarr_Windows_$VERSION/*
-  ./7za.exe a -ttar -so Radarr_Mono_$VERSION.tar ./Radarr_Mono_$VERSION/* | ./7za.exe a -si Radarr_Mono_$VERSION.tar.gz
-  ./7za.exe a -ttar -so Radarr_OSX_$VERSION.tar ./_output_osx/* | ./7za.exe a -si Radarr_OSX_$VERSION.tar.gz
-  ./7za.exe a -ttar -so Radarr_OSX_App_$VERSION.tar ./_output_osx_app/* | ./7za.exe a -si Radarr_OSX_App_$VERSION.tar.gz
-else
-zip -r Radarr_Windows_$VERSION.zip Radarr_Windows_$VERSION/* >& /dev/null
-zip -r Radarr_Mono_$VERSION.zip Radarr_Mono_$VERSION/* >& /dev/null #TODO update for tar.gz
-zip -r Radarr_OSX_$VERSION_App.zip Radarr_OSX_$VERSION/* >& /dev/null
-fi
-ftp -n ftp.leonardogalli.ch << END_SCRIPT
-passive
-quote USER $FTP_USER
-quote PASS $FTP_PASS
-mkdir builds
-cd builds
-mkdir $YEAR
-cd $YEAR
-mkdir $MONTH
-cd $MONTH
-mkdir $DAY
-cd $DAY
-binary
-put Radarr_Windows_$VERSION.zip
-put Radarr_Mono_$VERSION.zip
-put Radarr_OSX_$VERSION.zip
-quit
-END_SCRIPT
--- a/readme.md
+++ b/readme.md
@@ -1,67 +1,50 @@
-# Radarr [![Build Status](https://travis-ci.org/galli-leo/Radarr.svg?branch=develop)](https://travis-ci.org/galli-leo/Radarr)#
+# Sonarr #

-This fork of Sonarr aims to turn it into something like Couchpotato.

-## Currently working:
-* Adding new movies
-* Manually searching for releases of movies.
-* Automatically searching for releases.
-* Automatically importing downloaded movies.
-* Recognizing Special Editions, Director's Cut, etc.
-* Identifying releases with hardcoded subs.
-* Rarbg.to, Torznab and Newznab Indexer.
-* QBittorrent and Deluge download client (Other clients are coming)
-* New TorrentPotato Indexer (Works well with [Jackett](https://github.com/Jackett/Jackett))
-
-## Planned Features:
-* Scanning PreDB to know when a new release is available.
-* Fixing the other Indexers and download clients.
-* Importing of Sonarr config.
-
-## Download
-The latest precompiled binary versions can be found here: https://github.com/galli-leo/Radarr/releases.
-
-For more up to date versions (but also sometimes broken), daily builds can be found here:
-* [OSX](https://leonardogalli.ch/radarr/builds/latest.php?os=osx)
-* [Windows](https://leonardogalli.ch/radarr/builds/latest.php?os=windows)
-* [Linux](https://leonardogalli.ch/radarr/builds/latest.php?os=mono)
+Sonarr is a PVR for Usenet and BitTorrent users. It can monitor multiple RSS feeds for new episodes of your favorite shows and will grab, sort and rename them. It can also be configured to automatically upgrade the quality of files already downloaded when a better quality format becomes available.

 ## Major Features Include: ##

-* Support for major platforms: Windows, Linux, OSX, Raspberry Pi, etc.
-* Can watch for better quality of the movies you have and do an upgrade.
+* Support for major platforms: Windows, Linux, OSX, Raspberry Pi, etc. 
+* Automatically detects new episodes
+* Can scan your existing library and download any missing episodes
+* Can watch for better quality of the episodes you already have and do an automatic upgrade. *eg. from DVD to Blu-Ray*
 * Automatic failed download handling will try another release if one fails
-* Manual search so you can pick any release or to see why a release was not downloaded automatically.
-* Full integration with SABNzbd and NzbGet.
-* Full integration with XBMC, Plex (notification, library update, metadata).
+* Manual search so you can pick any release or to see why a release was not downloaded automatically
+* Fully configurable episode renaming
+* Full integration with SABNzbd and NzbGet
+* Full integration with XBMC, Plex (notification, library update, metadata)
+* Full support for specials and multi-episode releases
 * And a beautiful UI

+
 ## Configuring Development Environment: ##

 ### Requirements ###
- Visual Studio 2015 [Free Community Edition](https://www.visualstudio.com/en-us/products/visual-studio-community-vs.aspx) or Mono
+- Visual Studio 2013 ([Express Edition](http://www.microsoft.com/visualstudio/eng/products/visual-studio-express-for-web "Express Edition") might work but not tested.)
 - [Git](http://git-scm.com/downloads)
 - [NodeJS](http://nodejs.org/download/)
+- [Gulp](http://gulpjs.com)

 ### Setup ###

 - Make sure all the required software mentioned above are installed.
 - Clone the repository into your development machine. [*info*](https://help.github.com/articles/working-with-repositories)
- Grab the submodules `git submodule init && git submodule update`
 - install the required Node Packages `npm install`
- start gulp to monitor your dev environment for any changes that need post processing using `npm start` command.
+- install gulp `npm install gulp -g`
+- start gulp to monitor your dev environment for any changes that need post processing using `gulp watch` command.

-*Please note gulp must be running at all times while you are working with Sonarr client source files.*
+*Please note gulp must be running at all times while you are working with NzbDrone client source files.*


 ### Development ###
- Open `NzbDrone.sln` in Visual Studio or run the build.sh script, if Mono is installed.
+- Open `NzbDrone.sln` in Visual Studio
 - Make sure `NzbDrone.Console` is set as the startup project


 ### License ###
 * [GNU GPL v3](http://www.gnu.org/licenses/gpl.html)
-Copyright 2010-2016
+Copyright 2010-2014


 ### Sponsors ###
--- a/rename.ps1
+++ b/rename.ps1
@@ -0,0 +1,17 @@
+Param( 
+    [Parameter(Mandatory=$true, Position=0, HelpMessage="A branch name is #requires required")] 
+    [string]$branch, 
+    [Parameter(Mandatory=$true, Position=1, HelpMessage="A version is required")] 
+    [string]$version
+)
+
+if ($branch -eq "<default>")
+{
+    $branch = "teamcity";
+}
+
+Write-Host $branch;
+Write-Host $version;
+Write-Host "NzbDrone.$branch.$version.zip";
+
+Rename-Item "nzbdrone.zip" "NzbDrone.$branch.$version.zip"
--- a/schemas/torznab.xsd
+++ b/schemas/torznab.xsd
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           targetNamespace="http://torznab.com/schemas/2015/feed"
-           xmlns:torznab="http://torznab.com/schemas/2015/feed">
-  <xs:simpleType name="attrNames">
-    <xs:restriction base="xs:string">
-      <!-- https://github.com/nZEDb/nZEDb/blob/master/docs/newznab_api_specification.txt -->
-      <!-- http://newznab.readthedocs.org/en/latest/misc/api/ -->
-      <!-- Original newznab attributes -->
-      <!-- All -->
-      <xs:enumeration value="size" />
-      <xs:enumeration value="category" />
-      <xs:enumeration value="guid" />
-      <xs:enumeration value="poster" />
-      <xs:enumeration value="team" />
-      <xs:enumeration value="grabs" />
-      <xs:enumeration value="comments" />
-      <xs:enumeration value="year" />
-      <!-- TV -->
-      <xs:enumeration value="season" />
-      <xs:enumeration value="episode" />
-      <xs:enumeration value="rageid" />
-      <xs:enumeration value="tvtitle" />
-      <xs:enumeration value="tvairdate" />
-      <!-- TV, Movies, Audio -->
-      <xs:enumeration value="video" />
-      <xs:enumeration value="audio" />
-      <xs:enumeration value="resolution" />
-      <xs:enumeration value="framerate" />
-      <xs:enumeration value="language" />
-      <xs:enumeration value="subs" />
-      <!-- Movies -->
-      <xs:enumeration value="imdb" />
-      <xs:enumeration value="imdbscore" />
-      <xs:enumeration value="imdbtitle" />
-      <xs:enumeration value="imdbtagline" />
-      <xs:enumeration value="imdbscore" />
-      <xs:enumeration value="imdbtitle" />
-      <xs:enumeration value="imdbtagline" />
-      <xs:enumeration value="imdbplot" />
-      <xs:enumeration value="imdbyear" />
-      <xs:enumeration value="imdbdirector" />
-      <xs:enumeration value="imdbactors" />
-      <!-- TV, Movies -->
-      <xs:enumeration value="genre" />
-      <!-- Music -->
-      <xs:enumeration value="artist" />
-      <xs:enumeration value="album" />
-      <xs:enumeration value="publisher" />
-      <xs:enumeration value="tracks" />
-      <!-- Mixed -->
-      <xs:enumeration value="coverurl" />
-      <xs:enumeration value="backdropcoverurl" />
-      <xs:enumeration value="review" />
-      <!-- Book -->
-      <xs:enumeration value="booktitle" />
-      <xs:enumeration value="publishdate" />
-      <xs:enumeration value="author" />
-      <xs:enumeration value="pages" />
-
-      <!-- Generic extensions -->
-      <xs:enumeration value="type" /> <!-- series|movie|music|book if unknown just omit -->
-      <xs:enumeration value="tvdbid" />
-      <xs:enumeration value="bannerurl" />
-
-      <!-- Nzb extensions -->
-      <xs:enumeration value="nzbhash" /> <!-- TBD, hash of sorted article headers of relevant content (relevant excludes stuff like par,nfo,nzb etc) -->
-
-      <!-- Torrent extensions -->
-      <xs:enumeration value="infohash" />
-      <xs:enumeration value="magneturl" />
-      <xs:enumeration value="seeders" />
-      <xs:enumeration value="leechers" />
-      <xs:enumeration value="peers" /> <!-- seeders + leechers -->
-      <xs:enumeration value="seedtype" /> <!-- TBD, which criteria must be met. was going for 'ratio,seedtime,both' but afaik it's always 'either' -->
-      <xs:enumeration value="minimumratio" />
-      <xs:enumeration value="minimumseedtime" />
-      <xs:enumeration value="downloadvolumefactor" /> <!-- factor for the download volume, in most cases it should be set to 1, if a torrent is set to freeleech set it to 0, if only 50% is counted set it to 0.5 -->
-      <xs:enumeration value="uploadvolumefactor" /> <!-- factor for the upload volume, in most cases it should be set to 1, if a torrent is set to neutral leech (upload is not counted) set it to 0, if it's set to double upload set it to 2 -->
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:element name="attr">
-    <xs:complexType>
-      <xs:attribute name="name" type="torznab:attrNames" />
-      <xs:attribute name="value" type="xs:string" />
-    </xs:complexType>
-  </xs:element>
-</xs:schema>
--- a/sonarr.icns
+++ b/sonarr.icns
--- a/src/.nuget/NuGet.Config
+++ b/src/.nuget/NuGet.Config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <solution>
+    <add key="disableSourceControlIntegration" value="true" />
+  </solution>
+</configuration>
--- a/src/.nuget/NuGet.exe
+++ b/src/.nuget/NuGet.exe
--- a/src/.nuget/NuGet.targets
+++ b/src/.nuget/NuGet.targets
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup>
+        <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
+        
+        <!-- Enable the restore command to run before builds -->
+        <RestorePackages Condition="  '$(RestorePackages)' == '' ">false</RestorePackages>
+
+        <!-- Property that enables building a package from a project -->
+        <BuildPackage Condition=" '$(BuildPackage)' == '' ">false</BuildPackage>
+
+        <!-- Determines if package restore consent is required to restore packages -->
+        <RequireRestoreConsent Condition=" '$(RequireRestoreConsent)' != 'false' ">true</RequireRestoreConsent>
+        
+        <!-- Download NuGet.exe if it does not already exist -->
+        <DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">false</DownloadNuGetExe>
+    </PropertyGroup>
+    
+    <ItemGroup Condition=" '$(PackageSources)' == '' ">
+        <!-- Package sources used to restore packages. By default, registered sources under %APPDATA%\NuGet\NuGet.Config will be used -->
+        <!-- The official NuGet package source (https://www.nuget.org/api/v2/) will be excluded if package sources are specified and it does not appear in the list -->
+        <!--
+            <PackageSource Include="https://www.nuget.org/api/v2/" />
+            <PackageSource Include="https://my-nuget-source/nuget/" />
+        -->
+    </ItemGroup>
+
+    <PropertyGroup Condition=" '$(OS)' == 'Windows_NT'">
+        <!-- Windows specific commands -->
+        <NuGetToolsPath>$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath>
+        <PackagesConfig>$([System.IO.Path]::Combine($(ProjectDir), "packages.config"))</PackagesConfig>
+    </PropertyGroup>
+    
+    <PropertyGroup Condition=" '$(OS)' != 'Windows_NT'">
+        <!-- We need to launch nuget.exe with the mono command if we're not on windows -->
+        <NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath>
+        <PackagesConfig>packages.config</PackagesConfig>
+    </PropertyGroup>
+    
+    <PropertyGroup>
+        <!-- NuGet command -->
+        <NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\NuGet.exe</NuGetExePath>
+        <PackageSources Condition=" $(PackageSources) == '' ">@(PackageSource)</PackageSources>
+        
+        <NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
+        <NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand>
+
+        <PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
+        
+        <RequireConsentSwitch Condition=" $(RequireRestoreConsent) == 'true' ">-RequireConsent</RequireConsentSwitch>
+        <NonInteractiveSwitch Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' ">-NonInteractive</NonInteractiveSwitch>
+        
+        <PaddedSolutionDir Condition=" '$(OS)' == 'Windows_NT'">"$(SolutionDir) "</PaddedSolutionDir>
+        <PaddedSolutionDir Condition=" '$(OS)' != 'Windows_NT' ">"$(SolutionDir)"</PaddedSolutionDir>
+
+        <!-- Commands -->
+        <RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)"  $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir $(PaddedSolutionDir)</RestoreCommand>
+        <BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -Properties "Configuration=$(Configuration);Platform=$(Platform)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols</BuildCommand>
+
+        <!-- We need to ensure packages are restored prior to assembly resolve -->
+        <BuildDependsOn Condition="$(RestorePackages) == 'true'">
+            RestorePackages;
+            $(BuildDependsOn);
+        </BuildDependsOn>
+
+        <!-- Make the build depend on restore packages -->
+        <BuildDependsOn Condition="$(BuildPackage) == 'true'">
+            $(BuildDependsOn);
+            BuildPackage;
+        </BuildDependsOn>
+    </PropertyGroup>
+
+    <Target Name="CheckPrerequisites">
+        <!-- Raise an error if we're unable to locate nuget.exe  -->
+        <Error Condition="'$(DownloadNuGetExe)' != 'true' AND !Exists('$(NuGetExePath)')" Text="Unable to locate '$(NuGetExePath)'" />
+        <!--
+        Take advantage of MsBuild's build dependency tracking to make sure that we only ever download nuget.exe once.
+        This effectively acts as a lock that makes sure that the download operation will only happen once and all
+        parallel builds will have to wait for it to complete.
+        -->
+        <MsBuild Targets="_DownloadNuGet" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT;DownloadNuGetExe=$(DownloadNuGetExe)" />
+    </Target>
+
+    <Target Name="_DownloadNuGet">
+        <DownloadNuGet OutputFilename="$(NuGetExePath)" Condition=" '$(DownloadNuGetExe)' == 'true' AND !Exists('$(NuGetExePath)')" />
+    </Target>
+
+    <Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">
+        <Exec Command="$(RestoreCommand)"
+              Condition="'$(OS)' != 'Windows_NT' And Exists('$(PackagesConfig)')" />
+              
+        <Exec Command="$(RestoreCommand)"
+              LogStandardErrorAsError="true"
+              Condition="'$(OS)' == 'Windows_NT' And Exists('$(PackagesConfig)')" />
+    </Target>
+
+    <Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites">
+        <Exec Command="$(BuildCommand)" 
+              Condition=" '$(OS)' != 'Windows_NT' " />
+              
+        <Exec Command="$(BuildCommand)"
+              LogStandardErrorAsError="true"
+              Condition=" '$(OS)' == 'Windows_NT' " />
+    </Target>
+    
+    <UsingTask TaskName="DownloadNuGet" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
+        <ParameterGroup>
+            <OutputFilename ParameterType="System.String" Required="true" />
+        </ParameterGroup>
+        <Task>
+            <Reference Include="System.Core" />
+            <Using Namespace="System" />
+            <Using Namespace="System.IO" />
+            <Using Namespace="System.Net" />
+            <Using Namespace="Microsoft.Build.Framework" />
+            <Using Namespace="Microsoft.Build.Utilities" />
+            <Code Type="Fragment" Language="cs">
+                <![CDATA[
+                try {
+                    OutputFilename = Path.GetFullPath(OutputFilename);
+
+                    Log.LogMessage("Downloading latest version of NuGet.exe...");
+                    WebClient webClient = new WebClient();
+                    webClient.DownloadFile("https://www.nuget.org/nuget.exe", OutputFilename);
+
+                    return true;
+                }
+                catch (Exception ex) {
+                    Log.LogErrorFromException(ex);
+                    return false;
+                }
+            ]]>
+            </Code>
+        </Task>
+    </UsingTask>
+</Project>
--- a/src/Common/CommonVersionInfo.cs
+++ b/src/Common/CommonVersionInfo.cs
@@ -2,4 +2,4 @@

 using System.Reflection;

-[assembly: AssemblyVersion("0.1.0.*")]
+[assembly: AssemblyVersion("10.0.0.*")]
--- a/src/ExternalModules/CurlSharp
+++ b/src/ExternalModules/CurlSharp
--- a/src/Libraries/Manifest
+++ b/src/Libraries/Manifest
--- a/src/Libraries/Manifest
+++ b/src/Libraries/Manifest
@@ -0,0 +1,9 @@
+<?xml version ="1.0"?> 
+<!-- This allows mt.exe to run on machines with the CLR v4 installed but not 1.1 or 2.0 -->
+<configuration> 
+    <startup useLegacyV2RuntimeActivationPolicy="true"> 
+        <supportedRuntime version="v4.0"/> 
+        <supportedRuntime version="v2.0.50727"/>
+        <supportedRuntime version="v1.1.4322"/>
+    </startup> 
+</configuration>
--- a/src/Libraries/MediaInfo/MediaInfo.dll
+++ b/src/Libraries/MediaInfo/MediaInfo.dll
--- a/src/Libraries/MediaInfo/libmediainfo.0.dylib
+++ b/src/Libraries/MediaInfo/libmediainfo.0.dylib
--- a/src/LogentriesCore/AsyncLogger.cs
+++ b/src/LogentriesCore/AsyncLogger.cs
@@ -296,7 +296,7 @@ namespace LogentriesCore
                            WriteDebugMessages("HostName parameter is not defined - trying to get it from System.Environment.MachineName");
                            m_HostName = "HostName=" + System.Environment.MachineName + " ";
                        }
-                        catch (InvalidOperationException)
+                        catch (InvalidOperationException ex)
                        {
                            // Cannot get host name automatically, so assume that HostName is not used
                            // and log message is sent without it.
--- a/src/LogentriesCore/LogentriesCore.csproj
+++ b/src/LogentriesCore/LogentriesCore.csproj
@@ -73,6 +73,13 @@
    <PostBuildEvent>
    </PostBuildEvent>
  </PropertyGroup>
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+  </Target>
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
       Other similar extension points exist, see Microsoft.Common.targets.
  <Target Name="BeforeBuild">
--- a/src/LogentriesCore/Properties/AssemblyInfo.cs
+++ b/src/LogentriesCore/Properties/AssemblyInfo.cs
@@ -1,4 +1,5 @@
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

 // General Information about an assembly is controlled through the following 
--- a/src/LogentriesNLog/LogentriesNLog.csproj
+++ b/src/LogentriesNLog/LogentriesNLog.csproj
@@ -51,9 +51,8 @@
    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.3.11\lib\net40\NLog.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="NLog">
+      <HintPath>..\packages\NLog.2.1.0\lib\net40\NLog.dll</HintPath>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Core" />
@@ -80,13 +79,19 @@
  </ItemGroup>
  <ItemGroup>
    <None Include="fastJSON\license.txt" />
-    <None Include="packages.config" />
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <PropertyGroup>
    <PostBuildEvent>
    </PostBuildEvent>
  </PropertyGroup>
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+  </Target>
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
       Other similar extension points exist, see Microsoft.Common.targets.
  <Target Name="BeforeBuild">
--- a/src/LogentriesNLog/Properties/AssemblyInfo.cs
+++ b/src/LogentriesNLog/Properties/AssemblyInfo.cs
@@ -1,4 +1,5 @@
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

 // General Information about an assembly is controlled through the following 
--- a/src/LogentriesNLog/fastJSON/JSON.cs
+++ b/src/LogentriesNLog/fastJSON/JSON.cs
@@ -24,7 +24,6 @@ namespace LogentriesNLog.fastJSON
            SerializeNullValues = false;
            UseOptimizedDatasetSchema = false;
            UsingGlobalTypes = false;
-            UseUTCDateTime = true;
        }
        public bool UseOptimizedDatasetSchema = true;
        public bool UseFastGuid = true;
@@ -40,7 +39,7 @@ namespace LogentriesNLog.fastJSON
            return ToJSON(obj, UseSerializerExtension, UseFastGuid, UseOptimizedDatasetSchema, SerializeNullValues);
        }

-
+      
        public string ToJSON(object obj,
                             bool enableSerializerExtensions,
                             bool enableFastGuid,
@@ -50,13 +49,13 @@ namespace LogentriesNLog.fastJSON
            return new JSONSerializer(enableOptimizedDatasetSchema, enableFastGuid, enableSerializerExtensions, serializeNullValues, IndentOutput).ConvertToJSON(obj);
        }

-
+      
        public T ToObject<T>(string json)
        {
            return (T)ToObject(json, typeof(T));
        }

-
+      
        public object ToObject(string json, Type type)
        {
            var ht = new JsonParser(json).Decode() as Dictionary<string, object>;
@@ -321,7 +320,7 @@ namespace LogentriesNLog.fastJSON
                }
            }

-
+           
            _getterscache.Add(type, getters);
            return getters;
        }
@@ -449,7 +448,7 @@ namespace LogentriesNLog.fastJSON
 #if !SILVERLIGHT
                        else if (pi.isDictionary || pi.isHashtable)
                            oset = CreateDictionary((ArrayList)v, pi.pt, pi.GenericTypes, globaltypes);
-#else
+#else 
                        else if (pi.isDictionary)
                            oset = CreateDictionary((List<object>)v, pi.pt, pi.GenericTypes, globaltypes);
 #endif
@@ -818,4 +817,4 @@ namespace LogentriesNLog.fastJSON
        }
 #endif
    }
-}
+}
--- a/src/LogentriesNLog/fastJSON/JsonSerializer.cs
+++ b/src/LogentriesNLog/fastJSON/JsonSerializer.cs
@@ -170,8 +170,6 @@ namespace LogentriesNLog.fastJSON
            _output.Append(dt.Minute.ToString("00", NumberFormatInfo.InvariantInfo));
            _output.Append(":");
            _output.Append(dt.Second.ToString("00", NumberFormatInfo.InvariantInfo));
-            _output.Append(".");
-            _output.Append(dt.Millisecond.ToString("000", NumberFormatInfo.InvariantInfo));

            if (JSON.Instance.UseUTCDateTime)
                _output.Append("Z");
--- a/src/LogentriesNLog/packages.config
+++ b/src/LogentriesNLog/packages.config
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="NLog" version="4.3.11" targetFramework="net40" />
-</packages>
--- a/src/Marr.Data/Mapping/FluentMappings.cs
+++ b/src/Marr.Data/Mapping/FluentMappings.cs
@@ -198,8 +198,7 @@ namespace Marr.Data.Mapping
            {
                return AutoMapPropertiesWhere(m =>
                    m.MemberType == MemberTypes.Property &&
-                    !DataHelper.IsSimpleType((m as PropertyInfo).PropertyType) &&
-                    !MapRepository.Instance.TypeConverters.ContainsKey((m as PropertyInfo).PropertyType));
+                    !DataHelper.IsSimpleType((m as PropertyInfo).PropertyType));
            }

            /// <summary>
--- a/src/Marr.Data/Marr.Data.csproj
+++ b/src/Marr.Data/Marr.Data.csproj
@@ -144,6 +144,7 @@
    <PreBuildEvent>
    </PreBuildEvent>
  </PropertyGroup>
+  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
       Other similar extension points exist, see Microsoft.Common.targets.
  <Target Name="BeforeBuild">
--- a/src/MediaInfoDotNet.dll.config
+++ b/src/MediaInfoDotNet.dll.config
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <dllmap os="osx" dll="MediaInfo.dll" target="libmediainfo.0.dylib"/>
+    <dllmap os="linux" dll="MediaInfo.dll" target="libmediainfo.so.0" />
+    <dllmap os="freebsd" dll="MediaInfo.dll" target="libmediainfo.so.0" />
+    <dllmap os="solaris" dll="MediaInfo.dll" target="libmediainfo.so.0.0.0" />
+</configuration>
--- a/src/Microsoft.AspNet.SignalR.Core/AuthorizeAttribute.cs
+++ b/src/Microsoft.AspNet.SignalR.Core/AuthorizeAttribute.cs
@@ -122,7 +122,7 @@ namespace Microsoft.AspNet.SignalR
        {
            if (user == null)
            {
-                return false;
+                throw new ArgumentNullException("user");
            }

            if (!user.Identity.IsAuthenticated)
--- a/src/Microsoft.AspNet.SignalR.Core/Hosting/HostDependencyResolverExtensions.cs
+++ b/src/Microsoft.AspNet.SignalR.Core/Hosting/HostDependencyResolverExtensions.cs
@@ -20,12 +20,8 @@ namespace Microsoft.AspNet.SignalR.Hosting
                throw new ArgumentNullException("instanceName");
            }

-            // Performance counters are broken on mono so just skip this step
-            if (!MonoUtility.IsRunningMono)
-            {
-                // Initialize the performance counters
-                resolver.InitializePerformanceCounters(instanceName, hostShutdownToken);
-            }
+            // Initialize the performance counters
+            resolver.InitializePerformanceCounters(instanceName, hostShutdownToken);

            // Dispose the dependency resolver on host shut down (cleanly)
            resolver.InitializeResolverDispose(hostShutdownToken);
@@ -45,11 +41,12 @@ namespace Microsoft.AspNet.SignalR.Hosting
            // TODO: Guard against multiple calls to this

            // When the host triggers the shutdown token, dispose the resolver
-            hostShutdownToken.SafeRegister(state =>
+            hostShutdownToken.Register(state =>
            {
                ((IDependencyResolver)state).Dispose();
            },
-            resolver);
+            resolver,
+            useSynchronizationContext: false);
        }
    }
 }
--- a/src/Microsoft.AspNet.SignalR.Core/Hosting/IResponse.cs
+++ b/src/Microsoft.AspNet.SignalR.Core/Hosting/IResponse.cs
@@ -17,11 +17,6 @@ namespace Microsoft.AspNet.SignalR.Hosting
        /// </summary>
        CancellationToken CancellationToken { get; }

-        /// <summary>
-        /// Gets or sets the status code of the response.
-        /// </summary>
-        int StatusCode { get; set; }
-
        /// <summary>
        /// Gets or sets the content type of the response.
        /// </summary>
--- a/src/Microsoft.AspNet.SignalR.Core/Hosting/IWebSocket.cs
+++ b/src/Microsoft.AspNet.SignalR.Core/Hosting/IWebSocket.cs
@@ -16,9 +16,9 @@ namespace Microsoft.AspNet.SignalR.Hosting
        Action<string> OnMessage { get; set; }

        /// <summary>
-        /// Invoked when the websocket closes
+        /// Invoked when the websocket gracefully closes
        /// </summary>
-        Action OnClose { get; set; }
+        Action<bool> OnClose { get; set; }

        /// <summary>
        /// Invoked when there is an error
--- a/src/Microsoft.AspNet.SignalR.Core/Hosting/IWebSocketRequest.cs
+++ b/src/Microsoft.AspNet.SignalR.Core/Hosting/IWebSocketRequest.cs
@@ -11,7 +11,6 @@ namespace Microsoft.AspNet.SignalR.Hosting
        /// Accepts an websocket request using the specified user function.
        /// </summary>
        /// <param name="callback">The callback that fires when the websocket is ready.</param>
-        /// <param name="initTask">The task that completes when the websocket transport is ready.</param>
-        Task AcceptWebSocketRequest(Func<IWebSocket, Task> callback, Task initTask);
+        Task AcceptWebSocketRequest(Func<IWebSocket, Task> callback);
    }
 }
--- a/src/Microsoft.AspNet.SignalR.Core/Hubs/HubDispatcher.cs
+++ b/src/Microsoft.AspNet.SignalR.Core/Hubs/HubDispatcher.cs
@@ -358,7 +358,7 @@ namespace Microsoft.AspNet.SignalR.Hubs
        private Task ExecuteHubEvent(IRequest request, string connectionId, Func<IHub, Task> action)
        {
            var hubs = GetHubs(request, connectionId).ToList();
-            var operations = hubs.Select(instance => action(instance).OrEmpty().Catch()).ToArray();
+            var operations = hubs.Select(instance => action(instance).Catch().OrEmpty()).ToArray();

            if (operations.Length == 0)
            {
--- a/src/Microsoft.AspNet.SignalR.Core/Infrastructure/BinaryTextWriter.cs
+++ b/src/Microsoft.AspNet.SignalR.Core/Infrastructure/BinaryTextWriter.cs
@@ -1,34 +0,0 @@
-using System;
-using Microsoft.AspNet.SignalR.Hosting;
-
-namespace Microsoft.AspNet.SignalR.Infrastructure
-{
-    /// <summary>
-    /// A buffering text writer that supports writing binary directly as well
-    /// </summary>
-    internal unsafe class BinaryTextWriter : BufferTextWriter, IBinaryWriter
-    {
-        public BinaryTextWriter(IResponse response) :
-            base((data, state) => ((IResponse)state).Write(data), response, reuseBuffers: true, bufferSize: 128)
-        {
-
-        }
-
-        public BinaryTextWriter(IWebSocket socket) :
-            base((data, state) => ((IWebSocket)state).SendChunk(data), socket, reuseBuffers: false, bufferSize: 1024)
-        {
-
-        }
-
-
-        public BinaryTextWriter(Action<ArraySegment<byte>, object> write, object state, bool reuseBuffers, int bufferSize) :
-            base(write, state, reuseBuffers, bufferSize)
-        {
-        }
-
-        public void Write(ArraySegment<byte> data)
-        {
-            Writer.Write(data);
-        }
-    }
-}
--- a/src/Microsoft.AspNet.SignalR.Core/Infrastructure/BufferTextWriter.cs
+++ b/src/Microsoft.AspNet.SignalR.Core/Infrastructure/BufferTextWriter.cs
@@ -13,7 +13,7 @@ namespace Microsoft.AspNet.SignalR.Infrastructure
    /// we don't need to write to a long lived buffer. This saves massive amounts of memory
    /// as the number of connections grows.
    /// </summary>
-    internal abstract unsafe class BufferTextWriter : TextWriter
+    internal unsafe class BufferTextWriter : TextWriter, IBinaryWriter
    {
        private readonly Encoding _encoding;

@@ -31,13 +31,13 @@ namespace Microsoft.AspNet.SignalR.Infrastructure
        }

        public BufferTextWriter(IWebSocket socket) :
-            this((data, state) => ((IWebSocket)state).SendChunk(data), socket, reuseBuffers: false, bufferSize: 1024 * 4)
+            this((data, state) => ((IWebSocket)state).SendChunk(data), socket, reuseBuffers: false, bufferSize: 128)
        {

        }

        [SuppressMessage("Microsoft.Globalization", "CA1305:SpecifyIFormatProvider", MessageId = "System.IO.TextWriter.#ctor", Justification = "It won't be used")]
-        protected BufferTextWriter(Action<ArraySegment<byte>, object> write, object state, bool reuseBuffers, int bufferSize)
+        public BufferTextWriter(Action<ArraySegment<byte>, object> write, object state, bool reuseBuffers, int bufferSize)
        {
            _write = write;
            _writeState = state;
@@ -46,7 +46,7 @@ namespace Microsoft.AspNet.SignalR.Infrastructure
            _bufferSize = bufferSize;
        }

-        protected internal ChunkedWriter Writer
+        private ChunkedWriter Writer
        {
            get
            {
@@ -79,12 +79,17 @@ namespace Microsoft.AspNet.SignalR.Infrastructure
            Writer.Write(value);
        }

+        public void Write(ArraySegment<byte> data)
+        {
+            Writer.Write(data);
+        }
+
        public override void Flush()
        {
            Writer.Flush();
        }

-        internal class ChunkedWriter
+        private class ChunkedWriter
        {
            private int _charPos;
            private int _charLen;
--- a/src/Microsoft.AspNet.SignalR.Core/Infrastructure/CancellationTokenExtensions.cs
+++ b/src/Microsoft.AspNet.SignalR.Core/Infrastructure/CancellationTokenExtensions.cs
@@ -48,14 +48,8 @@ namespace Microsoft.AspNet.SignalR.Infrastructure
                // This normally waits until the callback is finished invoked but we don't care
                if (_callbackWrapper.TrySetInvoked())
                {
-                    try
-                    {
-                        _registration.Dispose();
-                    }
-                    catch (ObjectDisposedException)
-                    {
-                        // Bug #1549, .NET 4.0 has a bug where this throws if the CTS is disposed.
-                    }
+                    // Bug #1549, .NET 4.0 has a bug where this throws if the CTS
+                    _registration.Dispose();
                }
            }
        }
--- a/src/Microsoft.AspNet.SignalR.Core/Infrastructure/Connection.cs
+++ b/src/Microsoft.AspNet.SignalR.Core/Infrastructure/Connection.cs
@@ -144,7 +144,7 @@ namespace Microsoft.AspNet.SignalR.Infrastructure
        {
            using (var stream = new MemoryStream(128))
            {
-                var bufferWriter = new BinaryTextWriter((buffer, state) =>
+                var bufferWriter = new BufferTextWriter((buffer, state) =>
                {
                    ((MemoryStream)state).Write(buffer.Array, buffer.Offset, buffer.Count);
                },
@@ -236,7 +236,8 @@ namespace Microsoft.AspNet.SignalR.Infrastructure

                                                      if (command == null)
                                                      {
-                                                          if (MonoUtility.IsRunningMono)
+                                                          var platform = (int)Environment.OSVersion.Platform;
+                                                          if (platform == 4 || platform == 6 || platform == 128)
                                                          {
                                                              return;
                                                          }
--- a/src/Microsoft.AspNet.SignalR.Core/Infrastructure/MonoUtility.cs
+++ b/src/Microsoft.AspNet.SignalR.Core/Infrastructure/MonoUtility.cs
@@ -1,31 +0,0 @@
-using System;
-using System.Diagnostics.CodeAnalysis;
-
-namespace Microsoft.AspNet.SignalR.Infrastructure
-{
-    internal static class MonoUtility
-    {
-        private static readonly Lazy<bool> _isRunningMono = new Lazy<bool>(() => CheckRunningOnMono());
-
-        internal static bool IsRunningMono
-        {
-            get
-            {
-                return _isRunningMono.Value;
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "This should never fail")]
-        private static bool CheckRunningOnMono()
-        {
-            try
-            {
-                return Type.GetType("Mono.Runtime") != null;
-            }
-            catch
-            {
-                return false;
-            }
-        }
-    }
-}
--- a/src/Microsoft.AspNet.SignalR.Core/Infrastructure/NoOpPerformanceCounter.cs
+++ b/src/Microsoft.AspNet.SignalR.Core/Infrastructure/NoOpPerformanceCounter.cs
@@ -4,7 +4,7 @@ using System.Diagnostics;

 namespace Microsoft.AspNet.SignalR.Infrastructure
 {
-    public class NoOpPerformanceCounter : IPerformanceCounter
+    internal class NoOpPerformanceCounter : IPerformanceCounter
    {
        public string CounterName
        {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Taloth Saldono	4394860fac	Updated exception handler to ignore certain types of exceptions.	2015-02-07 15:22:49 +01:00
Taloth Saldono	1eeb40aede	Fixed: All issues regarding Media Covers should be fixed now after apply this update. Refresh browser cache if still missing and report issues on forum.	2015-02-06 22:38:37 +01:00
Taloth Saldono	7aaf40d9d4	Fixed: No longer leaves a corrupt file if MediaCover resize failed.	2015-02-04 07:31:24 -08:00