Merge branch 'master' into glitch-soc/tentative-merge

Conflicts:
	README.md
	app/controllers/statuses_controller.rb
	app/lib/feed_manager.rb
	config/navigation.rb
	spec/lib/feed_manager_spec.rb

Conflicts were resolved by taking both versions for each change.
This means the two filter systems (glitch-soc's keyword mutes and tootsuite's
custom filters) are in place, which will be changed in a follow-up commit.

1 files changed, 1 insertions, 1 deletions

diff --git a/public/emoji/1f1e9-1f1ec.svg b/public/emoji/1f1e9-1f1ec.svg
index 0266453dd..565a7aa4f 100644
--- a/public/emoji/1f1e9-1f1ec.svg
+++ b/public/emoji/1f1e9-1f1ec.svg
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 45 45" style="enable-background:new 0 0 45 45;" xml:space="preserve" version="1.1" id="svg2"><metadata id="metadata8"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/></cc:Work></rdf:RDF></metadata><defs id="defs6"><clipPath id="clipPath16" clipPathUnits="userSpaceOnUse"><path id="path18" d="M 0,36 36,36 36,0 0,0 0,36 Z"/></clipPath><clipPath id="clipPath80" clipPathUnits="userSpaceOnUse"><path id="path82" d="M 4,31 C 1.791,31 0,29.209 0,27 l 0,0 0,-9 19,0 0,13 -15,0 z"/></clipPath><clipPath id="clipPath96" clipPathUnits="userSpaceOnUse"><path id="path98" d="M 0,36 36,36 36,0 0,0 0,36 Z"/></clipPath></defs><g transform="matrix(1.25,0,0,-1.25,0,45)" id="g10"><g id="g12"><g clip-path="url(#clipPath16)" id="g14"><g transform="translate(36,9)" id="g20"><path id="path22" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 l -28,0 c -2.209,0 -4,1.791 -4,4 l 0,18 c 0,2.209 1.791,4 4,4 l 28,0 c 2.209,0 4,-1.791 4,-4 L 0,0 Z"/></g><g transform="translate(34.3633,7.875)" id="g24"><path id="path26" style="fill:#00247d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.817,0 -1.817,1.062 -3.636,1.062 -1.818,0 -1.818,-1 -3.693,-1 -1.762,0 -1.762,1 -3.609,1 -1.789,0 -1.789,-1 -3.607,-1 -1.818,0 -1.818,1 -3.637,1 -1.817,0 -1.817,-1 -3.636,-1 -1.818,0 -1.818,1 -3.636,1 -1.818,0 -1.818,-1 -3.636,-1 -1.819,0 -1.819,1 -3.637,1 -0.762,0 -1.201,-0.177 -1.591,-0.382 0.071,-0.638 0.277,-1.234 0.612,-1.744 0.264,0.077 0.576,0.127 0.979,0.127 1.818,0 1.818,-1 3.637,-1 1.818,0 1.818,1 3.636,1 1.818,0 1.818,-1 3.636,-1 1.819,0 1.819,1 3.636,1 1.819,0 1.819,-1 3.637,-1 1.818,0 1.818,1 3.629,1 1.825,0 1.825,-1 3.64,-1 1.822,0 1.822,1 3.638,1 1.821,0 1.821,-0.969 3.638,-0.969 0.088,0 0.157,0.01 0.236,0.014 C 0.91,-1.311 1.394,-0.52 1.562,0.392 1.179,0.181 0.744,0 0,0"/></g><g transform="translate(36,10.6172)" id="g28"><path id="path30" style="fill:#00247d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,1.944 C -0.402,1.717 -0.846,1.515 -1.637,1.515 c -1.817,0 -1.817,1.062 -3.635,1.062 -1.819,0 -1.819,-1 -3.694,-1 -1.761,0 -1.761,1 -3.608,1 -1.789,0 -1.789,-1 -3.608,-1 -1.818,0 -1.818,1 -3.636,1 -1.818,0 -1.818,-1 -3.637,-1 -1.818,0 -1.818,1 -3.636,1 -1.818,0 -1.818,-1 -3.636,-1 -1.818,0 -1.818,1 -3.637,1 -0.79,0 -1.234,-0.19 -1.636,-0.404 l 0,-2 c 0.402,0.214 0.846,0.404 1.636,0.404 1.819,0 1.819,-1 3.637,-1 1.818,0 1.818,1 3.636,1 1.818,0 1.818,-1 3.636,-1 1.819,0 1.819,1 3.637,1 1.818,0 1.818,-1 3.636,-1 1.819,0 1.819,1 3.629,1 1.826,0 1.826,-1 3.64,-1 1.822,0 1.822,1 3.639,1 1.82,0 1.82,-0.969 3.637,-0.969 0.791,0 1.235,0.185 1.637,0.392"/></g><g transform="translate(36,14.874)" id="g32"><path id="path34" style="fill:#00247d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,1.944 C -0.402,1.717 -0.846,1.515 -1.637,1.515 c -1.817,0 -1.817,1.063 -3.635,1.063 -1.819,0 -1.819,-1.001 -3.694,-1.001 -1.761,0 -1.761,1.001 -3.608,1.001 -1.789,0 -1.789,-1.001 -3.608,-1.001 -1.818,0 -1.818,1.001 -3.636,1.001 -1.818,0 -1.818,-1.001 -3.637,-1.001 -1.818,0 -1.818,1.001 -3.636,1.001 -1.818,0 -1.818,-1.001 -3.636,-1.001 -1.818,0 -1.818,1.001 -3.637,1.001 -0.79,0 -1.234,-0.191 -1.636,-0.405 l 0,-2 c 0.402,0.214 0.846,0.404 1.636,0.404 1.819,0 1.819,-1 3.637,-1 1.818,0 1.818,1 3.636,1 1.818,0 1.818,-1 3.636,-1 1.819,0 1.819,1 3.637,1 1.818,0 1.818,-1 3.636,-1 1.819,0 1.819,1 3.629,1 1.826,0 1.826,-1 3.64,-1 1.822,0 1.822,1 3.639,1 1.82,0 1.82,-0.969 3.637,-0.969 0.791,0 1.235,0.185 1.637,0.392"/></g><g transform="translate(36,19.1313)" id="g36"><path id="path38" style="fill:#00247d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,1.944 C -0.402,1.717 -0.846,1.515 -1.637,1.515 c -1.817,0 -1.817,1.062 -3.635,1.062 -1.819,0 -1.819,-1 -3.694,-1 -1.761,0 -1.761,1 -3.608,1 -1.789,0 -1.789,-1 -3.608,-1 -1.818,0 -1.818,1 -3.636,1 -1.818,0 -1.818,-1 -3.637,-1 -1.818,0 -1.818,1 -3.636,1 -1.818,0 -1.818,-1 -3.636,-1 -1.818,0 -1.818,1 -3.637,1 -0.79,0 -1.234,-0.19 -1.636,-0.404 l 0,-2 c 0.402,0.214 0.846,0.404 1.636,0.404 1.819,0 1.819,-1 3.637,-1 1.818,0 1.818,1 3.636,1 1.818,0 1.818,-1 3.636,-1 1.819,0 1.819,1 3.637,1 1.818,0 1.818,-1 3.636,-1 1.819,0 1.819,1 3.629,1 1.826,0 1.826,-1 3.64,-1 1.822,0 1.822,1 3.639,1 1.82,0 1.82,-0.969 3.637,-0.969 0.791,0 1.235,0.185 1.637,0.392"/></g><g transform="translate(36,23.3887)" id="g40"><path id="path42" style="fill:#00247d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,1.944 C -0.402,1.717 -0.846,1.515 -1.637,1.515 c -1.817,0 -1.817,1.062 -3.635,1.062 -1.819,0 -1.819,-1 -3.694,-1 -1.761,0 -1.761,1 -3.608,1 -1.789,0 -1.789,-1 -3.608,-1 -1.818,0 -1.818,1 -3.636,1 -1.818,0 -1.818,-1 -3.637,-1 -1.818,0 -1.818,1 -3.636,1 -1.818,0 -1.818,-1 -3.636,-1 -1.818,0 -1.818,1 -3.637,1 -0.79,0 -1.234,-0.19 -1.636,-0.404 l 0,-2 c 0.402,0.214 0.846,0.404 1.636,0.404 1.819,0 1.819,-1 3.637,-1 1.818,0 1.818,1 3.636,1 1.818,0 1.818,-1 3.636,-1 1.819,0 1.819,1 3.637,1 1.818,0 1.818,-1 3.636,-1 1.819,0 1.819,1 3.629,1 1.826,0 1.826,-1 3.64,-1 1.822,0 1.822,1 3.639,1 1.82,0 1.82,-0.969 3.637,-0.969 0.791,0 1.235,0.185 1.637,0.392"/></g><g transform="translate(35.9375,27.6162)" id="g44"><path id="path46" style="fill:#00247d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.095,0.611 -0.317,1.177 -0.656,1.663 -0.907,1.592 -1.2,1.544 -1.574,1.544 c -1.818,0 -1.818,1.062 -3.636,1.062 -1.818,0 -1.818,-1 -3.693,-1 -1.762,0 -1.762,1 -3.609,1 -1.789,0 -1.789,-1 -3.607,-1 -1.818,0 -1.818,1 -3.637,1 -1.818,0 -1.818,-1 -3.636,-1 -1.818,0 -1.818,1 -3.636,1 -1.819,0 -1.819,-1 -3.637,-1 -1.814,0 -1.819,0.995 -3.624,0.999 -0.771,-0.563 -1.335,-1.39 -1.548,-2.354 0.378,0.192 0.808,0.355 1.536,0.355 1.818,0 1.818,-1 3.636,-1 1.818,0 1.818,1 3.637,1 1.818,0 1.818,-1 3.636,-1 1.818,0 1.818,1 3.636,1 1.819,0 1.819,-1 3.637,-1 1.818,0 1.818,1 3.629,1 1.825,0 1.825,-1 3.639,-1 1.823,0 1.823,1 3.639,1 1.82,0 1.82,-0.968 3.638,-0.968 0.752,0 1.187,0.168 1.574,0.362"/></g><g transform="translate(19,31)" id="g48"><path id="path50" style="fill:#00247d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -15,0 c -2.209,0 -4,-1.791 -4,-4 l 0,-9 19,0 0,13 z"/></g><g transform="translate(19,18)" id="g52"><path id="path54" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,2.029 -7.1,7 -12.329,7 -2.332,0 0,0 Z"/></g><g transform="translate(19,19.418)" id="g56"><path id="path58" style="fill:#cf1b2b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -7.971,5.582 -1.743,0 L 0,-1.22 0,0 Z"/></g><g transform="translate(8.0996,25)" id="g60"><path id="path62" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -8.1,-5.766 -8.1,-7 -4.768,-7 5.23,0 0,0 Z"/></g><g transform="translate(10.7139,25)" id="g64"><path id="path66" style="fill:#cf1b2b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -9.98,-7 0.266,0 1.461,0 L 1.744,0 0,0 Z"/></g><g transform="translate(16.6689,31)" id="g68"><path id="path70" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -9.997,-7 5.229,0 7.099,4.971 L 2.331,0 0,0 Z"/></g><g transform="translate(17.5391,31)" id="g72"><path id="path74" style="fill:#cf1b2b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -9.996,-7 1.743,0 9.714,6.802 L 1.461,0 0,0 Z"/></g></g></g><g id="g76"><g clip-path="url(#clipPath80)" id="g78"><g transform="translate(10,24)" id="g84"><path id="path86" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 3.328,0 -6.668,7 -9,7 -9.625,5.406 0,-1.331 0,0 Z"/></g><g transform="translate(10,24)" id="g88"><path id="path90" style="fill:#cf1b2b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.714,0 -9,6.802 -9.5,5.937 0,-0.722 0,0 Z"/></g></g></g><g id="g92"><g clip-path="url(#clipPath96)" id="g94"><g transform="translate(19,27)" id="g100"><path id="path102" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -7,0 0,4 -5,0 0,-4 -7,0 0,-5 7,0 0,-4 5,0 0,4 7,0 0,5 z"/></g><path id="path104" style="fill:#cf1b2b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 11,18 -3,0 0,13 3,0 0,-13 z"/><path id="path106" style="fill:#cf1b2b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 19,23 -19,0 0,3 19,0 0,-3 z"/><g transform="translate(27.248,7.3232)" id="g108"><path id="path110" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.179 -0.143,-0.323 -0.322,-0.323 -0.179,0 -0.324,0.144 -0.324,0.323 l 0,15.861 c 0,0.179 0.145,0.324 0.324,0.324 C -0.143,16.185 0,16.04 0,15.861 L 0,0 Z"/></g><g transform="translate(24.6563,15.6357)" id="g112"><path id="path114" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0.139,0.334 0.627,0.334 0.49,0 0.607,-0.255 0.901,-0.372 0.294,-0.118 0.666,-0.177 0.666,-0.177 l 0,-2.447 -2.624,0 c 0,0 -0.098,0.92 -0.255,1.37 -0.157,0.449 -0.294,1.058 0.039,1.254 C -0.312,0.156 0,0 0,0"/></g><g transform="translate(26.8398,16.2725)" id="g116"><path id="path118" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-0.352 c 0,0 -0.675,0.059 -1.263,0.47 -0.358,0.25 -1.116,0.559 -1.703,0.058 -0.382,-0.322 -0.352,-1.146 -0.116,-1.468 0.233,-0.323 0.469,-1.058 -0.031,-0.559 -0.499,0.5 -0.647,1.264 -0.499,1.763 0.147,0.499 0.469,0.998 1.233,0.998 0.765,0 1.264,-0.411 1.616,-0.617 C -0.457,0.115 0.031,0.059 0,0"/></g><g transform="translate(23.8945,14.501)" id="g120"><path id="path122" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.41,0.018 0.293,-0.607 c 0,0 0.411,0.312 0.431,0.235 0.018,-0.08 0.078,-0.647 0.078,-0.647 l -0.529,0.118 0.313,-0.452 -0.41,-0.194 c 0,0 -0.157,0.528 -0.196,0.781 C -0.061,-0.51 0,0 0,0"/></g><g transform="translate(24.7549,14.167)" id="g124"><path id="path126" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.391,0.039 c 0,0 -0.338,0.764 0.157,0.745 0.549,-0.02 0.176,-0.725 0.176,-0.725 l 0.412,0 0.058,-0.568 -0.39,0.236 0,-0.334 L 1.233,-1.019 0.098,-1.135 0.391,-0.646 0.372,-0.294 0.098,-0.607 0,0 Z"/></g><g transform="translate(29.2051,15.6357)" id="g128"><path id="path130" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -0.138,0.334 -0.627,0.334 -0.489,0 -0.606,-0.255 -0.9,-0.372 -0.294,-0.118 -0.666,-0.177 -0.666,-0.177 l 0,-2.447 2.625,0 c 0,0 0.096,0.92 0.254,1.37 0.157,0.449 0.293,1.058 -0.039,1.254 C 0.312,0.156 0,0 0,0"/></g><g transform="translate(27.0215,16.2725)" id="g132"><path id="path134" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-0.352 c 0,0 0.676,0.059 1.263,0.47 0.358,0.25 1.116,0.559 1.704,0.058 0.382,-0.322 0.351,-1.146 0.116,-1.468 -0.234,-0.323 -0.468,-1.058 0.03,-0.559 0.499,0.5 0.648,1.264 0.499,1.763 C 3.466,0.411 3.143,0.91 2.379,0.91 1.614,0.91 1.115,0.499 0.764,0.293 0.459,0.115 -0.029,0.059 0,0"/></g><g transform="translate(29.9688,14.501)" id="g136"><path id="path138" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.411,0.018 0.117,-0.625 c 0,0 -0.411,0.312 -0.431,0.235 -0.018,-0.08 -0.078,-0.647 -0.078,-0.647 l 0.528,0.118 -0.314,-0.452 0.411,-0.194 c 0,0 0.157,0.528 0.198,0.781 C 0.058,-0.51 0,0 0,0"/></g><g transform="translate(29.1064,14.167)" id="g140"><path id="path142" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.392,0.039 c 0,0 0.339,0.764 -0.157,0.745 -0.547,-0.02 -0.175,-0.725 -0.175,-0.725 l -0.411,0 -0.06,-0.568 0.392,0.236 0,-0.334 -0.43,-0.412 1.136,-0.116 -0.295,0.489 0.021,0.352 0.274,-0.313 L 0,0 Z"/></g><g transform="translate(27.6113,17.2617)" id="g144"><path id="path146" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.39 -0.308,-0.704 -0.686,-0.704 -0.378,0 -0.685,0.314 -0.685,0.704 0,0.389 0.307,0.705 0.685,0.705 C -0.308,0.705 0,0.389 0,0"/></g><path id="path148" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 27.542,18.318 -1.232,0 0,0.49 1.232,0 0,-0.49 z"/><path id="path150" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 27.219,14.617 -0.586,0 0,4.523 0.586,0 0,-4.523 z"/><g transform="translate(26.4395,14.8135)" id="g152"><path id="path154" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.92,0 -0.255,-0.646 0.588,0.313 0,-0.86 -0.569,0.194 0.49,-0.743 -1.273,0 0.392,0.743 -0.567,-0.136 0,0.764 L 0.255,-0.626 0,0 Z"/></g><g transform="translate(26.9277,13.3652)" id="g156"><path id="path158" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.215,0 1.978,-0.1 2.84,-0.411 0,0 0.059,-0.511 -0.059,-0.765 -0.116,-0.255 -2.8,0.177 -2.8,0.177 L 0,0 Z"/></g><g transform="translate(26.9629,13.3652)" id="g160"><path id="path162" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.214,0 -1.978,-0.1 -2.838,-0.411 0,0 -0.06,-0.511 0.057,-0.765 0.118,-0.255 2.799,0.177 2.799,0.177 L 0,0 Z"/></g><g transform="translate(30.0781,11.6699)" id="g164"><path id="path166" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.384 -1.412,-0.693 -3.152,-0.693 -1.741,0 -3.154,0.309 -3.154,0.693 0,0.385 1.413,0.696 3.154,0.696 C -1.412,0.696 0,0.385 0,0"/></g><g transform="translate(29.043,11.417)" id="g168"><path id="path170" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.212 -0.948,-0.384 -2.117,-0.384 -1.17,0 -2.119,0.172 -2.119,0.384 0,0.21 0.949,0.382 2.119,0.382 C -0.948,0.382 0,0.21 0,0"/></g><g transform="translate(25.6553,29.127)" id="g172"><path id="path174" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.645,-0.803 c 0,0 0.452,0.275 0.471,0.216 0.02,-0.059 -0.039,-0.666 -0.039,-0.666 L 1.391,-1.331 1.136,-2.134 c 0,0 0.392,0.216 0.372,0.137 -0.02,-0.078 -0.117,-0.764 -0.117,-0.764 l 0.157,-0.097 -0.02,-0.765 c 0,0 0.158,-0.273 0.158,-0.214 0,0.058 0.156,0.998 0.156,0.998 l 0.216,-0.176 0.076,0.489 0.177,0.842 0.196,-0.313 0.411,1.391 0.216,-0.49 0.489,0.568 0.333,0.019 0.489,0.137 0.099,-0.294 0.45,0 c 0,0 -0.234,-0.196 -0.215,-0.254 0.019,-0.059 0.43,-0.274 0.371,-0.294 -0.058,-0.019 -1.057,0.079 -1.057,0.079 L 3.526,-1.703 3.878,-1.821 3.348,-2.134 3.799,-2.271 3.388,-2.584 3.74,-2.545 3.172,-2.976 3.74,-3.094 2.977,-3.485 3.152,-3.681 2.39,-4.131 2.291,-4.445 3.016,-3.877 c 0,0 0.588,0.392 0.88,0.568 0.294,0.176 0.53,0.509 1.02,0.646 0.49,0.137 1.429,-0.02 1.429,-0.02 L 5.463,-3.152 5.64,-3.426 5.072,-3.603 5.15,-3.935 4.21,-4.073 4.229,-4.425 3.427,-4.562 3.329,-4.895 2.781,-5.091 3.036,-5.306 c 0,0 -0.471,-0.157 -0.411,-0.176 0.059,-0.02 0.686,-0.079 0.686,-0.079 0,0 -0.315,-0.274 -0.256,-0.274 0.059,0 0.841,-0.039 0.841,-0.039 L 3.563,-6.109 4.349,-6.148 3.994,-6.422 c 0,0 0.647,-0.059 0.647,-0.118 0,-0.058 -0.274,-0.352 -0.274,-0.352 l 0.567,-0.059 c 0,0 -0.273,-0.294 -0.215,-0.314 0.06,-0.019 0.803,-0.528 0.803,-0.528 l -0.881,0.117 c 0,0 -0.215,-0.293 -0.236,-0.234 -0.018,0.058 -0.233,0.411 -0.233,0.411 L 3.956,-7.734 3.722,-7.265 c 0,0 -0.275,-0.156 -0.256,-0.097 0.019,0.059 -0.314,0.431 -0.314,0.431 L 3.074,-7.108 2.859,-6.579 2.664,-6.854 2.291,-6.344 2.154,-6.559 1.645,-6.109 c 0,0 -0.019,-0.294 0,-0.352 0.02,-0.059 0.373,-0.314 0.373,-0.314 0,0 -0.236,-0.098 -0.236,-0.156 0,-0.059 0.471,-0.431 0.471,-0.431 L 2.037,-7.519 2.546,-7.95 c 0,0 -0.47,-0.097 -0.412,-0.137 0.06,-0.039 0.294,-0.352 0.294,-0.352 l -0.196,-0.47 -0.39,0.607 -0.216,-0.059 -0.04,0.509 -0.214,0.02 0.116,0.567 -0.234,-0.038 -0.02,0.47 -0.098,0.469 -0.196,0.314 c 0,0 -0.136,-0.236 -0.118,-0.294 C 0.843,-6.403 1,-6.775 1,-6.775 c 0,0 -0.216,-0.117 -0.178,-0.176 0.04,-0.059 0.255,-0.489 0.255,-0.489 0,0 -0.47,-0.098 -0.411,-0.098 0.06,0 0.216,-0.274 0.216,-0.274 L 0.627,-7.91 0.51,-8.204 c 0,0 -0.293,0.333 -0.275,0.274 0.02,-0.059 -0.176,-0.607 -0.176,-0.607 l -0.292,0.333 0.292,1.155 -0.353,0.098 -0.254,-0.529 c 0,0 -0.215,0.254 -0.235,0.196 -0.02,-0.058 -0.236,-0.45 -0.236,-0.45 0,0 -0.252,0.431 -0.233,0.372 0.019,-0.059 -0.295,-0.686 -0.295,-0.686 0,0 -0.274,0.549 -0.274,0.47 0,-0.078 -0.196,-0.763 -0.196,-0.763 0,0 -0.312,0.529 -0.294,0.431 0.021,-0.098 -0.214,-0.549 -0.214,-0.549 l -0.06,0.49 -0.43,-0.255 0.49,0.705 0.823,0.764 0.627,0.469 -0.413,0.059 c 0,0 0.596,0.208 0.665,0.216 0.177,0.02 -0.273,0.176 -0.273,0.176 L 0,-5.502 c 0,0 -0.489,0.255 -0.548,0.196 -0.059,-0.059 -0.646,-0.176 -0.646,-0.176 l -0.079,0.45 -0.606,-0.255 c 0,0 -0.099,0.412 -0.118,0.353 -0.02,-0.059 -0.49,-0.313 -0.49,-0.313 l -0.234,0.254 -0.275,-0.431 -0.314,0.236 -0.566,-0.177 0.273,0.411 -0.313,0.177 0.646,0.411 0.137,0.274 0.882,-0.059 c 0,0 -0.236,0.314 -0.196,0.255 0.04,-0.059 0.9,-0.196 0.9,-0.196 l 0.256,0.039 0.861,-0.313 -0.705,0.568 -0.607,0.117 0.391,0.313 -0.92,0.333 0.197,0.313 -1.216,0.314 0.746,0.196 -0.51,0.861 1.057,-0.627 0.47,0.157 0.236,-0.607 0.431,-0.255 0.077,-0.45 0.216,0.098 0.195,-0.528 0.256,0.078 0.136,-0.372 0.373,-0.02 -0.099,0.49 0.156,0.235 -0.43,0.352 0.373,0.176 -0.549,0.451 0.469,0.059 -0.666,0.646 0.531,-0.02 -0.531,0.607 0.432,0.098 L 0,0 Z"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#EEE" d="M36 27c0 2.209-1.791 4-4 4H4c-2.209 0-4-1.791-4-4V9c0-2.209 1.791-4 4-4h28c2.209 0 4 1.791 4 4v18z"/><path d="M34.363 28.125c-1.817 0-1.817-1.062-3.636-1.062-1.818 0-1.818 1-3.693 1-1.762 0-1.762-1-3.608-1-1.789 0-1.789 1-3.607 1-1.818 0-1.818-1-3.637-1-1.818 0-1.818 1-3.636 1s-1.818-1-3.636-1-1.818 1-3.636 1-1.818-1-3.637-1c-.762 0-1.201.178-1.591.383.071.638.277 1.233.613 1.744.263-.077.575-.127.979-.127 1.818 0 1.818 1 3.637 1 1.818 0 1.818-1 3.636-1s1.818 1 3.636 1 1.818-1 3.636-1 1.818 1 3.637 1c1.818 0 1.818-1 3.629-1 1.825 0 1.825 1 3.64 1 1.822 0 1.822-1 3.639-1 1.82 0 1.82.969 3.638.969.088 0 .157-.01.236-.015.674-.581 1.157-1.372 1.326-2.283-.386.21-.821.391-1.565.391zM36 25.383v-1.944c-.402.228-.846.43-1.637.43-1.817 0-1.817-1.062-3.636-1.062-1.818 0-1.818 1-3.693 1-1.762 0-1.762-1-3.608-1-1.789 0-1.789 1-3.607 1-1.818 0-1.818-1-3.637-1-1.818 0-1.818 1-3.636 1s-1.818-1-3.636-1-1.818 1-3.636 1-1.818-1-3.637-1c-.791 0-1.234.19-1.636.404v2c.402-.214.846-.404 1.636-.404 1.818 0 1.818 1 3.637 1 1.818 0 1.818-1 3.636-1s1.818 1 3.636 1 1.818-1 3.636-1 1.818 1 3.637 1c1.818 0 1.818-1 3.629-1 1.825 0 1.825 1 3.64 1 1.822 0 1.822-1 3.639-1 1.82 0 1.82.969 3.638.969.789-.002 1.233-.186 1.635-.393zm0-4.257v-1.944c-.402.228-.846.43-1.637.43-1.817 0-1.817-1.063-3.636-1.063-1.818 0-1.818 1-3.693 1-1.762 0-1.762-1-3.608-1-1.789 0-1.789 1-3.607 1-1.818 0-1.818-1-3.637-1-1.818 0-1.818 1-3.636 1s-1.818-1-3.636-1-1.818 1-3.636 1-1.818-1-3.637-1c-.791 0-1.234.191-1.636.404v2c.402-.214.846-.404 1.636-.404 1.818 0 1.818 1 3.637 1 1.818 0 1.818-1 3.636-1s1.818 1 3.636 1 1.818-1 3.636-1 1.818 1 3.637 1c1.818 0 1.818-1 3.629-1 1.825 0 1.825 1 3.64 1 1.822 0 1.822-1 3.639-1 1.82 0 1.82.969 3.638.969.789 0 1.233-.185 1.635-.392zm0-4.257v-1.944c-.402.228-.846.43-1.637.43-1.817 0-1.817-1.062-3.636-1.062-1.818 0-1.818 1-3.693 1-1.762 0-1.762-1-3.608-1-1.789 0-1.789 1-3.607 1-1.818 0-1.818-1-3.637-1-1.818 0-1.818 1-3.636 1s-1.818-1-3.636-1-1.818 1-3.636 1-1.818-1-3.637-1c-.791 0-1.234.19-1.636.404v2c.402-.214.846-.404 1.636-.404 1.818 0 1.818 1 3.637 1 1.818 0 1.818-1 3.636-1s1.818 1 3.636 1 1.818-1 3.636-1 1.818 1 3.637 1c1.818 0 1.818-1 3.629-1 1.825 0 1.825 1 3.64 1 1.822 0 1.822-1 3.639-1 1.82 0 1.82.969 3.638.969.789-.002 1.233-.186 1.635-.393zm0-4.258v-1.944c-.402.227-.846.43-1.637.43-1.817 0-1.817-1.062-3.636-1.062-1.818 0-1.818 1-3.693 1-1.762 0-1.762-1-3.608-1-1.789 0-1.789 1-3.607 1-1.818 0-1.818-1-3.637-1-1.818 0-1.818 1-3.636 1s-1.818-1-3.636-1-1.818 1-3.636 1-1.818-1-3.637-1c-.791 0-1.234.19-1.636.404v2c.402-.214.846-.404 1.636-.404 1.818 0 1.818 1 3.637 1 1.818 0 1.818-1 3.636-1s1.818 1 3.636 1 1.818-1 3.636-1 1.818 1 3.637 1c1.818 0 1.818-1 3.629-1 1.825 0 1.825 1 3.64 1 1.822 0 1.822-1 3.639-1 1.82 0 1.82.969 3.638.969.789-.001 1.233-.186 1.635-.393zm-.062-4.227c-.095-.611-.317-1.177-.656-1.663-.252.071-.545.119-.919.119-1.817 0-1.817-1.062-3.636-1.062-1.818 0-1.818 1-3.693 1-1.762 0-1.762-1-3.608-1-1.789 0-1.789 1-3.607 1-1.818 0-1.818-1-3.637-1-1.818 0-1.818 1-3.636 1s-1.818-1-3.636-1-1.818 1-3.636 1c-1.814 0-1.82-.994-3.625-.999C.877 6.342.314 7.169.101 8.133c.377-.193.808-.356 1.535-.356 1.818 0 1.818 1 3.637 1 1.818 0 1.818-1 3.636-1s1.818 1 3.636 1 1.818-1 3.636-1 1.818 1 3.637 1c1.818 0 1.818-1 3.629-1 1.825 0 1.825 1 3.64 1 1.822 0 1.822-1 3.639-1 1.82 0 1.82.969 3.638.969.751 0 1.187-.168 1.574-.362z" fill="#00247D"/><path fill="#C1694F" d="M27.248 28.677c0 .179-.143.323-.322.323-.179 0-.324-.145-.324-.323V12.815c0-.178.146-.323.324-.323.179 0 .322.145.322.323v15.862z"/><path fill="#DD2E44" d="M24.656 20.364s.139-.334.627-.334c.49 0 .607.255.901.372.294.118.666.177.666.177v2.447h-2.624s-.099-.92-.255-1.37c-.157-.449-.294-1.058.039-1.254.334-.194.646-.038.646-.038z"/><path fill="#FFCC4D" d="M26.84 19.728v.352s-.675-.059-1.263-.47c-.358-.25-1.116-.559-1.703-.058-.382.322-.353 1.146-.116 1.468.233.323.469 1.058-.031.559-.499-.5-.647-1.264-.499-1.763.147-.499.47-.998 1.233-.998.765 0 1.264.411 1.616.617.306.177.794.233.763.293z"/><path fill="#FFCC4D" d="M23.895 21.499l.41-.019-.117.626s.411-.312.431-.235c.018.08.078.646.078.646l-.53-.117.313.451-.41.194s-.157-.528-.196-.781c-.04-.255.021-.765.021-.765zm.86.334l.391-.039s-.338-.764.157-.745c.549.021.176.726.176.726h.412l.059.567-.391-.235v.334l.43.411-1.136.116.293-.489-.018-.351-.274.313-.099-.608z"/><path fill="#DD2E44" d="M29.205 20.364s-.138-.334-.627-.334-.606.255-.9.372c-.294.118-.666.177-.666.177v2.447h2.625s.097-.92.254-1.37c.157-.449.293-1.058-.039-1.254-.334-.194-.647-.038-.647-.038z"/><path fill="#FFCC4D" d="M27.021 19.728v.352s.676-.059 1.263-.47c.358-.25 1.116-.559 1.704-.058.382.322.351 1.146.116 1.468-.234.323-.468 1.058.03.559.499-.5.647-1.264.499-1.763-.146-.499-.47-.998-1.233-.998-.765 0-1.264.411-1.615.617-.305.177-.793.233-.764.293z"/><path fill="#FFCC4D" d="M29.969 21.499l-.411-.019.117.626s-.411-.312-.431-.235c-.019.08-.078.646-.078.646l.527-.117-.313.451.411.194s.157-.528.197-.781c.038-.255-.019-.765-.019-.765zm-.863.334l-.392-.039s.339-.764-.157-.745c-.547.021-.175.726-.175.726h-.411l-.061.567.393-.235v.334l-.431.411 1.137.116-.295-.489.021-.351.274.313.097-.608zm-1.495-3.095c0 .39-.308.704-.685.704-.379 0-.686-.315-.686-.704 0-.389.307-.705.686-.705.378.001.685.316.685.705zm-1.301-1.546h1.232v.49H26.31z"/><path fill="#FFCC4D" d="M26.633 16.859h.586v4.523h-.586z"/><path fill="#FFCC4D" d="M26.44 21.187h.919l-.255.646.588-.313v.86l-.569-.195.49.744h-1.272l.391-.744-.567.136v-.763l.529.254z"/><path fill="#FFCC4D" d="M26.928 22.635c1.215 0 1.978.1 2.84.411 0 0 .06.511-.059.765-.116.255-2.8-.177-2.8-.177l.019-.999z"/><path fill="#FFCC4D" d="M26.963 22.635c-1.214 0-1.978.1-2.838.411 0 0-.06.511.057.765.118.255 2.8-.177 2.8-.177l-.019-.999z"/><path fill="#EEE" d="M30.078 24.33c0 .384-1.412.693-3.152.693-1.74 0-3.153-.309-3.153-.693 0-.385 1.413-.696 3.153-.696s3.152.311 3.152.696z"/><path fill="#99AAB5" d="M29.043 24.583c0 .212-.948.384-2.117.384-1.17 0-2.119-.172-2.119-.384 0-.21.949-.382 2.119-.382 1.169 0 2.117.172 2.117.382z"/><path fill="#77B255" d="M25.655 6.873l.646.803s.451-.274.471-.215c.02.059-.039.666-.039.666l.313.078-.255.803s.393-.215.372-.137c-.019.078-.117.764-.117.764l.157.098-.02.764s.157.273.157.215c0-.058.156-.998.156-.998l.216.176.076-.489.177-.842.196.313.411-1.391.216.49.489-.568.333-.02.489-.137.099.293h.45s-.234.196-.215.254c.018.059.43.274.371.294-.059.02-1.058-.079-1.058-.079l-.566.568.352.118-.53.313.451.137-.411.313.353-.039-.568.431.568.118-.764.391.176.196-.763.451-.099.313.725-.568s.588-.392.881-.568c.294-.176.529-.509 1.02-.646s1.429.02 1.429.02l-.882.47.177.274-.567.176.078.332-.941.138.02.352-.803.138-.098.333-.548.196.255.215s-.471.157-.411.176c.059.02.685.078.685.078s-.314.274-.256.274c.06 0 .842.039.842.039l-.333.235.785.039-.354.274s.646.059.646.118c0 .058-.273.352-.273.352l.567.059s-.273.293-.216.314c.061.019.804.528.804.528l-.882-.117s-.215.293-.235.234c-.018-.058-.233-.411-.233-.411l-.216.235-.234-.47s-.274.156-.256.098c.02-.059-.313-.431-.313-.431l-.078.177-.215-.529-.195.274-.373-.51-.137.215-.51-.45s-.019.294 0 .353c.02.059.373.313.373.313s-.235.098-.235.156c0 .059.471.431.471.431l-.216.157.509.431s-.47.098-.412.137c.06.039.294.352.294.352l-.195.47-.391-.607-.216.059-.04-.509-.214-.02.116-.567-.234.039-.02-.47-.099-.47-.195-.314s-.137.235-.118.293c.02.059.178.431.178.431s-.216.117-.178.176c.04.059.255.489.255.489s-.47.098-.411.098c.06 0 .216.274.216.274l-.255.098-.117.294s-.293-.333-.274-.274c.02.059-.176.607-.176.607l-.293-.333.293-1.155-.354-.098-.254.529s-.215-.254-.235-.196c-.02.059-.235.451-.235.451s-.252-.431-.233-.372c.019.058-.295.686-.295.686s-.274-.549-.274-.47c0 .078-.195.764-.195.764s-.312-.529-.294-.431c.021.098-.215.549-.215.549l-.06-.49-.43.254.489-.705.823-.764.627-.469-.414-.058s.597-.207.665-.215c.178-.02-.272-.176-.272-.176l1.096-.333s-.489-.255-.548-.196c-.059.059-.647.176-.647.176l-.078-.45-.606.254s-.099-.412-.118-.353c-.019.059-.49.313-.49.313l-.233-.254-.275.431-.314-.235-.566.176.273-.411-.313-.176.646-.411.137-.274.882.059s-.236-.314-.196-.255c.04.059.9.196.9.196l.256-.039.861.313-.705-.568-.607-.118.392-.313-.921-.332.197-.313-1.216-.313.746-.196-.51-.862 1.057.627.47-.157.236.607.431.255.077.45.216-.098.195.528.256-.079.136.373.374.019-.1-.49.156-.235-.431-.353.374-.176-.55-.451.47-.059-.666-.646.53.02-.53-.607.432-.098-.081-.782z"/><path fill="#00247D" d="M19 18V5H4c-.32 0-.604.045-.604.045l-.004 1.754-2.73-.004S.62 6.854.535 7C.195 7.589 0 8.272 0 9v9h19z"/><path fill="#EEE" d="M19 5h-2.331L12 8.269V5H7v2.569L3.396 5.045c-.614.094-1.19.325-1.672.665L6.426 9H4.69L.967 6.391c-.11.129-.211.262-.305.404L3.813 9H0v5h3.885L0 16.766V18h3.332L7 15.432V18h5v-3.269L16.668 18H19v-2.029L16.185 14H19V9h-2.814L19 7.029V5z"/><path fill="#CF1B2B" d="M11 5H8v5H0v3h8v5h3v-5h8v-3h-8z"/><path fill="#CF1B2B" d="M19 5h-1.461L12 8.879V9h1.571L19 5.198zm-17.276.71c-.281.195-.534.423-.757.681L4.69 9h1.735L1.724 5.71zM6.437 14L.734 18h1.727L7 14.822V14zM19 17.802v-1.22L15.313 14H13.57z"/></svg>
\ No newline at end of file