Merge lp:~jose/charms/precise/byobu-classroom/1297694-fix into lp:charms/byobu-classroom

[José Antonio Rey]

Charm no longer access EC2 metadata directly, added icon, README, categories and fixed metadata.yaml

Charmworld reports the following errors:

    err: Unknown root metadata field (ensemble)
    warn: Metadata is missing categories.
    warn: No icon.svg file.
    warn: no README file
    warn: (install:31) - hook accesses EC2 metadata service directly

Fixed all of them and added placeholder config.yaml and config-changed files, as charm proof was throwing errors.

[Marco Ceppi (marcoceppi)]

Please do not create "empty" hooks or config.yaml files. "I" (INFO) proof lines aren't errors, but informational. I have to reject this merge on that alone. The rest of the merge looks good, though the README seems a bit lite (though, a readme is better than none).

When ready for another review please make sure to "Request another review" from "charmers". Thanks for all your work!

review: Needs Fixing

[lp:~jose/charms/precise/byobu-classroom/1297694-fix]

14. By José Antonio Rey on 2014-04-08

Fixed errors

[Cory Johns (johnsca)]

José,

Thank for your improvements to the byobu-classroom charm. The icon looks very nice, and the README is good, although it might also be nice if it included some more information about how to use it once started (e.g., the login information).

This is a good improvement to this charm, and I give it my +1.

Thanks again for all of your contributions.

[Marco Ceppi (marcoceppi)]

LGTM

review: Approve

=== added file 'README.md'
--- README.md	1970-01-01 00:00:00 +0000
+++ README.md	2014-04-08 00:50:29 +0000
@@ -0,0 +1,29 @@
+# Overview
+
+byobu-class provides remote terminal access through a web browser, using https,
+ajaxterm, and byobu. It operates in a one-writer, many reader mode.
+
+# Usage
+
+In order to deploy byobu-classroom, execute the following commands:
+
+    juju bootstrap
+    juju deploy byobu-classroom
+
+Then, expose the service by doing:
+
+    juju expose byobu-classroom
+
+Once that's done, you can access the service at the public IP address/DNS given
+by:
+
+    juju status
+
+# Configuration
+
+This charm has no configuration options.
+
+# Contact Information
+
+Maintainer: Mark Mims <[e-mail]>
+Report bugs at: https://bugs.launchpad.net/charms/
 
=== modified file 'hooks/install'
--- hooks/install	2011-11-09 19:24:24 +0000
+++ hooks/install	2014-04-08 00:50:29 +0000
@@ -28,7 +28,7 @@
 # Most web browsers can do a little better than 80x25; bump to 160x40
 sed -i -e "s/^width=.*/width=160;/" -e "s/^height=.*/height=40;/" /etc/ajaxterm.conf
 service ajaxterm restart
-h=$(wget -q -O- http://169.254.169.254/latest/meta-data/public-hostname) || h=$(hostname -s)
+h=$(unit-get public-address) || h=$(hostname -s)
 echo "<meta http-equiv='refresh' content='0;url=https://$h/'>" > /var/www/index.html
 
 sed -i -e "s/__HOSTNAME__/$h/" /var/www/index.html
 
=== added file 'icon.svg'
--- icon.svg	1970-01-01 00:00:00 +0000
+++ icon.svg	2014-04-08 00:50:29 +0000
@@ -0,0 +1,739 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="96"
+   height="96"
+   id="svg6517"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="icon.svg">
+  <defs
+     id="defs6519">
+    <linearGradient
+       id="Background">
+      <stop
+         id="stop4178"
+         offset="0"
+         style="stop-color:#b8b8b8;stop-opacity:1" />
+      <stop
+         id="stop4180"
+         offset="1"
+         style="stop-color:#c9c9c9;stop-opacity:1" />
+    </linearGradient>
+    <filter
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Inner Shadow"
+       id="filter1121">
+      <feFlood
+         flood-opacity="0.59999999999999998"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood1123" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="out"
+         result="composite1"
+         id="feComposite1125" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="1"
+         result="blur"
+         id="feGaussianBlur1127" />
+      <feOffset
+         dx="0"
+         dy="2"
+         result="offset"
+         id="feOffset1129" />
+      <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite2"
+         id="feComposite1131" />
+    </filter>
+    <filter
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Drop Shadow"
+       id="filter950">
+      <feFlood
+         flood-opacity="0.50200803212851408"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood952" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="in"
+         result="composite1"
+         id="feComposite954" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="1"
+         result="blur"
+         id="feGaussianBlur956" />
+      <feOffset
+         dx="0"
+         dy="1"
+         result="offset"
+         id="feOffset958" />
+      <feComposite
+         in="SourceGraphic"
+         in2="offset"
+         operator="over"
+         result="composite2"
+         id="feComposite960" />
+    </filter>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath873">
+      <g
+         transform="matrix(0,-0.66666667,0.66604479,0,-258.25992,677.00001)"
+         id="g875"
+         inkscape:label="Layer 1"
+         style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline">
+        <path
+           style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline"
+           d="m 46.702703,898.22775 50.594594,0 C 138.16216,898.22775 144,904.06497 144,944.92583 l 0,50.73846 c 0,40.86071 -5.83784,46.69791 -46.702703,46.69791 l -50.594594,0 C 5.8378378,1042.3622 0,1036.525 0,995.66429 L 0,944.92583 C 0,904.06497 5.8378378,898.22775 46.702703,898.22775 Z"
+           id="path877"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="sssssssss" />
+      </g>
+    </clipPath>
+    <filter
+       inkscape:collect="always"
+       id="filter891"
+       inkscape:label="Badge Shadow">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.71999962"
+         id="feGaussianBlur893" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4.0745362"
+     inkscape:cx="-42.228439"
+     inkscape:cy="49.018169"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer3"
+     showgrid="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1056"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     showborder="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:showpageshadow="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid821" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="16,48"
+       id="guide823" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="64,80"
+       id="guide825" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="80,40"
+       id="guide827" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="64,16"
+       id="guide829" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata6522">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="BACKGROUND"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(268,-635.29076)"
+     style="display:inline">
+    <path
+       style="fill:#dd4814;fill-opacity:1;stroke:none;display:inline;filter:url(#filter1121)"
+       d="m -268,700.15563 0,-33.72973 c 0,-27.24324 3.88785,-31.13513 31.10302,-31.13513 l 33.79408,0 c 27.21507,0 31.1029,3.89189 31.1029,31.13513 l 0,33.72973 c 0,27.24325 -3.88783,31.13514 -31.1029,31.13514 l -33.79408,0 C -264.11215,731.29077 -268,727.39888 -268,700.15563 Z"
+       id="path6455"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sssssssss" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="PLACE YOUR PICTOGRAM HERE"
+     style="display:inline">
+    <g
+       id="g4037"
+       transform="matrix(0.225,0,0,0.225,53.695707,38.281781)"
+       style="filter:url(#filter950)">
+      <path
+         id="path4136"
+         d="m -163.55085,-90.527358 2.65153,272.015078"
+         style="fill:#ffcca3;fill-opacity:0.75;stroke:#000000;stroke-width:0.64681846px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path4158"
+         d="m -164.21373,-89.917448 3.31441,272.624948 95.459729,-10.36829 88.8309,13.41779 86.179381,-6.09899 3.97729,-265.916068 -84.852941,-7.3188 -95.460389,14.0277 -97.44838,-10.36829 z"
+         style="fill:none;stroke:#000000;stroke-width:0.64681846px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path4162"
+         d="m -66.76535,-79.549158 0,252.498278 0,0"
+         style="fill:#ffcca3;fill-opacity:0.75;stroke:#000000;stroke-width:0.64681846px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path4164"
+         d="m 28.695039,-94.186748 0,278.723948"
+         style="fill:#ffcca3;fill-opacity:0.15306121;stroke:#000000;stroke-width:0.64681846px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path4166"
+         d="m 29.076039,45.80486 0,-138.907298 1.82278,0.28888 c 1.00274,0.15888 19.71516,1.81543 41.58285,3.6812 21.86838,1.86578 39.894301,3.51561 40.058191,3.6663 0.53339,0.49112 -3.57137,263.626118 -4.12095,264.131558 -0.29333,0.27008 -18.265321,1.74107 -39.938131,3.26886 l -39.40474,2.77777 0,-138.90727 z"
+         style="fill:#f4bd71;fill-opacity:0.11224491;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path4168"
+         d="m 29.076039,45.80486 0,-138.907298 1.82278,0.28888 c 1.00274,0.15888 19.71516,1.81543 41.58285,3.6812 21.86838,1.86578 39.894301,3.51561 40.058191,3.6663 0.53339,0.49112 -3.57137,263.626118 -4.12095,264.131558 -0.29333,0.27008 -18.265321,1.74107 -39.938131,3.26886 l -39.40474,2.77777 0,-138.90727 z"
+         style="fill:#f4bd71;fill-opacity:0.11224491;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path4170"
+         d="m 29.076039,45.80486 0,-138.907298 1.82278,0.28888 c 1.00274,0.15888 19.71516,1.81543 41.58285,3.6812 21.86838,1.86578 39.894301,3.51561 40.058191,3.6663 0.53339,0.49112 -3.57137,263.626118 -4.12095,264.131558 -0.29333,0.27008 -18.265321,1.74107 -39.938131,3.26886 l -39.40474,2.77777 0,-138.90727 z"
+         style="fill:#f4bd71;fill-opacity:0.11224491;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path4172"
+         d="m 29.076039,45.80486 0,-138.907298 1.82278,0.28888 c 1.00274,0.15888 19.71516,1.81543 41.58285,3.6812 21.86838,1.86578 39.894301,3.51561 40.058191,3.6663 0.53339,0.49112 -3.57137,263.626118 -4.12095,264.131558 -0.29333,0.27008 -18.265321,1.74107 -39.938131,3.26886 l -39.40474,2.77777 0,-138.90727 z"
+         style="fill:#f4bd71;fill-opacity:0.11224491;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path4176"
+         d="m -20.642801,178.54423 c -22.78815,-3.46598 -42.4022,-6.46701 -43.58702,-6.66899 l -2.154529,-0.36718 0,-125.30664 c 0,-68.918668 0.22993,-125.306658 0.511159,-125.306658 0.28051,0 21.0281,-3.01901 46.10434,-6.70889 25.0768997,-3.6899 46.02681,-6.70889 46.55617,-6.70889 0.83888,0 0.96231,17.86713 0.96231,138.752058 l 0,138.75208 -3.4803,-0.0675 c -1.91381,-0.0372 -22.1246403,-2.90336 -44.91213,-6.36933 l 0,0 z"
+         style="fill:#ffcca3;fill-opacity:0.15306121;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path4178"
+         d="m -20.642801,178.54423 c -22.78815,-3.46598 -42.4022,-6.46701 -43.58702,-6.66899 l -2.154529,-0.36718 0,-125.30664 c 0,-68.918668 0.22993,-125.306658 0.511159,-125.306658 0.28051,0 21.0281,-3.01901 46.10434,-6.70889 25.0768997,-3.6899 46.02681,-6.70889 46.55617,-6.70889 0.83888,0 0.96231,17.86713 0.96231,138.752058 l 0,138.75208 -3.4803,-0.0675 c -1.91381,-0.0372 -22.1246403,-2.90336 -44.91213,-6.36933 l 0,0 z"
+         style="fill:#ffcca3;fill-opacity:0.15306121;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path4180"
+         d="m -20.642801,178.54423 c -22.78815,-3.46598 -42.4022,-6.46701 -43.58702,-6.66899 l -2.154529,-0.36718 0,-125.30664 c 0,-68.918668 0.22993,-125.306658 0.511159,-125.306658 0.28051,0 21.0281,-3.01901 46.10434,-6.70889 25.0768997,-3.6899 46.02681,-6.70889 46.55617,-6.70889 0.83888,0 0.96231,17.86713 0.96231,138.752058 l 0,138.75208 -3.4803,-0.0675 c -1.91381,-0.0372 -22.1246403,-2.90336 -44.91213,-6.36933 l 0,0 z"
+         style="fill:#ffcca3;fill-opacity:0.15306121;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path4182"
+         d="m -20.642801,178.54423 c -22.78815,-3.46598 -42.4022,-6.46701 -43.58702,-6.66899 l -2.154529,-0.36718 0,-125.30664 c 0,-68.918668 0.22993,-125.306658 0.511159,-125.306658 0.28051,0 21.0281,-3.01901 46.10434,-6.70889 25.0768997,-3.6899 46.02681,-6.70889 46.55617,-6.70889 0.83888,0 0.96231,17.86713 0.96231,138.752058 l 0,138.75208 -3.4803,-0.0675 c -1.91381,-0.0372 -22.1246403,-2.90336 -44.91213,-6.36933 l 0,0 z"
+         style="fill:#ffcca3;fill-opacity:0.15306121;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path4184"
+         d="m 29.076039,45.80486 0,-138.907298 1.82278,0.28888 c 1.00274,0.15888 19.71516,1.81543 41.58285,3.6812 21.86838,1.86578 39.894301,3.51561 40.058191,3.6663 0.53339,0.49112 -3.57137,263.626118 -4.12095,264.131558 -0.29333,0.27008 -18.265321,1.74107 -39.938131,3.26886 l -39.40474,2.77777 0,-138.90727 z"
+         style="fill:#f4bd71;fill-opacity:0.11224491;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path4186"
+         d="m 29.076039,45.80486 0,-138.907298 1.82278,0.28888 c 1.00274,0.15888 19.71516,1.81543 41.58285,3.6812 21.86838,1.86578 39.894301,3.51561 40.058191,3.6663 0.53339,0.49112 -3.57137,263.626118 -4.12095,264.131558 -0.29333,0.27008 -18.265321,1.74107 -39.938131,3.26886 l -39.40474,2.77777 0,-138.90727 z"
+         style="fill:#f4bd71;fill-opacity:0.11224491;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path4700"
+         d="m -20.642801,178.54423 c -22.78815,-3.46598 -42.4022,-6.46701 -43.58702,-6.66899 l -2.154529,-0.36718 0,-125.30664 c 0,-68.918668 0.22993,-125.306658 0.511159,-125.306658 0.28051,0 21.0281,-3.01901 46.10434,-6.70889 25.0768997,-3.6899 46.02681,-6.70889 46.55617,-6.70889 0.83888,0 0.96231,17.86713 0.96231,138.752058 l 0,138.75208 -3.4803,-0.0675 c -1.91381,-0.0372 -22.1246403,-2.90336 -44.91213,-6.36933 l 0,0 z"
+         style="fill:#ffcca3;fill-opacity:0.19607843;stroke:#000000;stroke-width:6.46818447;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path4702"
+         d="m -160.57158,157.38319 c -0.027,-13.50164 -0.56511,-74.36198 -1.19023,-135.24516 -0.62579,-60.883188 -1.04321,-110.816618 -0.9279,-110.963168 0.17399,-0.22169 71.495496,7.14453 89.51065,9.24487 l 5.46895,0.63762 0,125.557948 c 0,108.87053 -0.12679,125.55793 -0.95421,125.55793 -0.52532,0 -21.14546,2.19564 -45.82247,4.87921 -24.67769,2.68354 -45.12992,4.87919 -45.44956,4.87919 -0.32369,0 -0.60556,-10.9082 -0.63523,-24.54844 l 0,0 z"
+         style="fill:#ffcca3;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.46818447;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path6195"
+         d="M 82.391179,174.16891 26.042849,126.59677 -8.4283713,110.1295 -28.316181,68.04644 l -33.80834,-31.10485 -0.66287,-18.29698 11.26901,-43.912738"
+         style="fill:none;stroke:#000000;stroke-width:5.82136583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.68627451;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path6197"
+         d="M 23.391309,124.15717 76.424579,97.9315"
+         style="fill:none;stroke:#000000;stroke-width:5.17454767;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.58823529;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path6199"
+         d="M 14.110959,119.27797 57.200319,82.68404"
+         style="fill:none;stroke:#000000;stroke-width:5.17454767;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.58823529;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path6201"
+         d="M 2.1784087,114.3988 -34.944991,140.62445"
+         style="fill:none;stroke:#000000;stroke-width:3.23409224;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.58823529;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path6203"
+         d="m -10.611901,102.90693 -40.68935,18.63143 -24.412678,-20.37814 -65.103371,4.07564"
+         style="fill:none;stroke:#000000;stroke-width:4.90143967;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.68627451;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path6205"
+         d="M -29.641941,65.60686 0.8519787,29.01291 59.851849,-10.630558 l 20.55068,-3.04948 0.66289,0"
+         style="fill:none;stroke:#000000;stroke-width:5.17454767;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.68627451;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path6207"
+         d="M -13.732101,45.48018 -20.360931,19.86442 8.8072187,4.007032"
+         style="fill:none;stroke:#000000;stroke-width:4.52772903;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.58823529;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path6209"
+         d="m -3.7882113,11.32581 -0.66287,-26.835548 18.5620403,1.21979 53.03327,-45.74245"
+         style="fill:none;stroke:#000000;stroke-width:3.23409224;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.58823529;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path6211"
+         d="m -62.787391,21.08421 31.81969,-29.275148"
+         style="fill:none;stroke:#000000;stroke-width:3.23409224;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.58823529;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path6213"
+         d="M -63.450291,26.57331 -91.956224,37.5515 -125.10167,11.32581 -137.03422,9.49612"
+         style="fill:none;stroke:#000000;stroke-width:4.52772903;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.68627451;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path6215"
+         d="m -61.461631,13.15554 -45.741549,-24.395998 -27.84239,1.21981 4.64017,-20.73657"
+         style="fill:none;stroke:#000000;stroke-width:3.23409224;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.58823529;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         transform="matrix(0.67434588,0,0,0.62041473,-11432.465,-103.94514)"
+         d="m 17097.22,140.57626 c 0,5.42924 -4.181,9.83051 -9.339,9.83051 -5.158,0 -9.339,-4.40127 -9.339,-9.83051 0,-5.42924 4.181,-9.8305 9.339,-9.8305 5.158,0 9.339,4.40126 9.339,9.8305 z"
+         sodipodi:ry="9.8305082"
+         sodipodi:rx="9.3389826"
+         sodipodi:cy="140.57626"
+         sodipodi:cx="17087.881"
+         id="path6251"
+         style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.67434588,0,0,0.62041473,-11419.206,-105.77482)"
+         d="m 17064.78,167.61017 c 0,4.61485 -3.081,8.35593 -6.882,8.35593 -3.8,0 -6.881,-3.74108 -6.881,-8.35593 0,-4.61486 3.081,-8.35593 6.881,-8.35593 3.801,0 6.882,3.74107 6.882,8.35593 z"
+         sodipodi:ry="8.3559322"
+         sodipodi:rx="6.8813558"
+         sodipodi:cy="167.61017"
+         sodipodi:cx="17057.898"
+         id="path6253"
+         style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.67434588,0,0,0.62041473,-11416.555,-116.75303)"
+         d="m 17046.101,147.45763 c 0,5.97216 -5.281,10.81356 -11.796,10.81356 -6.515,0 -11.797,-4.8414 -11.797,-10.81356 0,-5.97217 5.282,-10.81356 11.797,-10.81356 6.515,0 11.796,4.84139 11.796,10.81356 z"
+         sodipodi:ry="10.81356"
+         sodipodi:rx="11.79661"
+         sodipodi:cy="147.45763"
+         sodipodi:cx="17034.305"
+         id="path6255"
+         style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.67434588,0,0,0.62041473,-11437.769,-116.75303)"
+         d="m 17067.729,110.10169 c 0,4.88632 -3.081,8.84746 -6.881,8.84746 -3.801,0 -6.882,-3.96114 -6.882,-8.84746 0,-4.88631 3.081,-8.84746 6.882,-8.84746 3.8,0 6.881,3.96115 6.881,8.84746 z"
+         sodipodi:ry="8.8474579"
+         sodipodi:rx="6.8813558"
+         sodipodi:cy="110.10169"
+         sodipodi:cx="17060.848"
+         id="path6257"
+         style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.67434588,0,0,0.62041473,-11428.488,-125.90151)"
+         d="m 17030.373,110.10169 c 0,5.42924 -4.622,9.83051 -10.322,9.83051 -5.701,0 -10.322,-4.40127 -10.322,-9.83051 0,-5.42924 4.621,-9.83051 10.322,-9.83051 5.7,0 10.322,4.40127 10.322,9.83051 z"
+         sodipodi:ry="9.8305082"
+         sodipodi:rx="10.322034"
+         sodipodi:cy="110.10169"
+         sodipodi:cx="17020.051"
+         id="path6259"
+         style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.67434588,0,0,0.62041473,-11421.196,-67.351178)"
+         d="m 17026.44,256.57626 c 0,2.71462 -2.421,4.91526 -5.407,4.91526 -2.986,0 -5.407,-2.20064 -5.407,-4.91526 0,-2.71462 2.421,-4.91525 5.407,-4.91525 2.986,0 5.407,2.20063 5.407,4.91525 z"
+         sodipodi:ry="4.9152541"
+         sodipodi:rx="5.4067798"
+         sodipodi:cy="256.57626"
+         sodipodi:cx="17021.033"
+         id="path6261"
+         style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.67434588,0,0,0.62041473,-11421.196,-101.50553)"
+         d="m 17037.254,282.62711 c 0,5.15777 -4.622,9.33898 -10.322,9.33898 -5.701,0 -10.322,-4.18121 -10.322,-9.33898 0,-5.15778 4.621,-9.33899 10.322,-9.33899 5.7,0 10.322,4.18121 10.322,9.33899 z"
+         sodipodi:ry="9.3389826"
+         sodipodi:rx="10.322034"
+         sodipodi:cy="282.62711"
+         sodipodi:cx="17026.932"
+         id="path6263"
+         style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.67434588,0,0,0.62041473,-11446.388,-111.87383)"
+         d="m 17051.016,307.2034 c 0,5.7007 -4.401,10.32203 -9.83,10.32203 -5.43,0 -9.831,-4.62133 -9.831,-10.32203 0,-5.7007 4.401,-10.32203 9.831,-10.32203 5.429,0 9.83,4.62133 9.83,10.32203 z"
+         sodipodi:ry="10.322034"
+         sodipodi:rx="9.8305082"
+         sodipodi:cy="307.2034"
+         sodipodi:cx="17041.186"
+         id="path6265"
+         style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.67434588,0,0,0.62041473,-11428.488,-105.77482)"
+         d="m 17088.373,335.71185 c 0,4.61486 -5.282,8.35594 -11.797,8.35594 -6.515,0 -11.796,-3.74108 -11.796,-8.35594 0,-4.61485 5.281,-8.35593 11.796,-8.35593 6.515,0 11.797,3.74108 11.797,8.35593 z"
+         sodipodi:ry="8.3559322"
+         sodipodi:rx="11.79661"
+         sodipodi:cy="335.71185"
+         sodipodi:cx="17076.576"
+         id="path6267"
+         style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.67434588,0,0,0.62041473,-11471.577,-213.727)"
+         d="m 17035.288,360.77966 c 0,2.1717 -2.421,3.93221 -5.407,3.93221 -2.986,0 -5.407,-1.76051 -5.407,-3.93221 0,-2.17169 2.421,-3.9322 5.407,-3.9322 2.986,0 5.407,1.76051 5.407,3.9322 z"
+         sodipodi:ry="3.9322033"
+         sodipodi:rx="5.4067798"
+         sodipodi:cy="360.77966"
+         sodipodi:cx="17029.881"
+         id="path6269"
+         style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.67434588,0,0,0.62041473,-11418.543,-109.43424)"
+         d="m 17051.016,354.88135 c 0,3.80047 -3.741,6.88135 -8.356,6.88135 -4.615,0 -8.356,-3.08088 -8.356,-6.88135 0,-3.80047 3.741,-6.88136 8.356,-6.88136 4.615,0 8.356,3.08089 8.356,6.88136 z"
+         sodipodi:ry="6.8813558"
+         sodipodi:rx="8.3559322"
+         sodipodi:cy="354.88135"
+         sodipodi:cx="17042.66"
+         id="path6271"
+         style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.67434588,0,0,0.62041473,-11435.778,-124.0718)"
+         d="m 16905.525,414.35593 c 0,5.15777 -4.182,9.33898 -9.339,9.33898 -5.158,0 -9.339,-4.18121 -9.339,-9.33898 0,-5.15778 4.181,-9.33899 9.339,-9.33899 5.157,0 9.339,4.18121 9.339,9.33899 z"
+         sodipodi:ry="9.3389826"
+         sodipodi:rx="9.3389826"
+         sodipodi:cy="414.35593"
+         sodipodi:cx="16896.186"
+         id="path6273"
+         style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.67434588,0,0,0.62041473,-11459.646,-64.301688)"
+         d="m 16959.592,339.15256 c 0,5.42924 -2.42,9.83051 -5.406,9.83051 -2.987,0 -5.407,-4.40127 -5.407,-9.83051 0,-5.42924 2.42,-9.83051 5.407,-9.83051 2.986,0 5.406,4.40127 5.406,9.83051 z"
+         sodipodi:ry="9.8305082"
+         sodipodi:rx="5.4067798"
+         sodipodi:cy="339.15256"
+         sodipodi:cx="16954.186"
+         id="path6275"
+         style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.67434588,0,0,0.62041473,-11341.645,-277.76641)"
+         d="m 16923.22,338.66101 c 0,4.07193 -4.181,7.37288 -9.339,7.37288 -5.158,0 -9.339,-3.30095 -9.339,-7.37288 0,-4.07193 4.181,-7.37288 9.339,-7.37288 5.158,0 9.339,3.30095 9.339,7.37288 z"
+         sodipodi:ry="7.3728814"
+         sodipodi:rx="9.3389826"
+         sodipodi:cy="338.66101"
+         sodipodi:cx="16913.881"
+         id="path6277"
+         style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.67434588,0,0,0.62041473,-11457.656,-195.43002)"
+         d="m 16962.541,287.54236 c 0,5.15778 -3.741,9.33898 -8.355,9.33898 -4.615,0 -8.356,-4.1812 -8.356,-9.33898 0,-5.15778 3.741,-9.33898 8.356,-9.33898 4.614,0 8.355,4.1812 8.355,9.33898 z"
+         sodipodi:ry="9.3389826"
+         sodipodi:rx="8.3559322"
+         sodipodi:cy="287.54236"
+         sodipodi:cx="16954.186"
+         id="path6279"
+         style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.67434588,0,0,0.62041473,-11405.286,-166.15485)"
+         d="m 16931.084,260.01694 c 0,5.15777 -3.301,9.33898 -7.373,9.33898 -4.072,0 -7.373,-4.18121 -7.373,-9.33898 0,-5.15778 3.301,-9.33899 7.373,-9.33899 4.072,0 7.373,4.18121 7.373,9.33899 z"
+         sodipodi:ry="9.3389826"
+         sodipodi:rx="7.3728814"
+         sodipodi:cy="260.01694"
+         sodipodi:cx="16923.711"
+         id="path6281"
+         style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.67434588,0,0,0.62041473,-11432.465,-134.44009)"
+         d="m 16927.152,211.35593 c 0,4.34339 -3.961,7.8644 -8.847,7.8644 -4.887,0 -8.848,-3.52101 -8.848,-7.8644 0,-4.3434 3.961,-7.86441 8.848,-7.86441 4.886,0 8.847,3.52101 8.847,7.86441 z"
+         sodipodi:ry="7.8644066"
+         sodipodi:rx="8.8474579"
+         sodipodi:cy="211.35593"
+         sodipodi:cx="16918.305"
+         id="path6283"
+         style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.33717295,0,0,0.74449769,-5751.2721,-133.09832)"
+         d="m 16904.543,131.72882 c 0,5.42924 -5.721,9.83051 -12.779,9.83051 -7.058,0 -12.78,-4.40127 -12.78,-9.83051 0,-5.42924 5.722,-9.83051 12.78,-9.83051 7.058,0 12.779,4.40127 12.779,9.83051 z"
+         sodipodi:ry="9.8305082"
+         sodipodi:rx="12.779661"
+         sodipodi:cy="131.72882"
+         sodipodi:cx="16891.764"
+         id="path6287"
+         style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.67434588,0,0,0.62041473,-11443.735,-109.43424)"
+         d="m 16769.864,129.27118 c 0,7.32947 -4.402,13.27119 -9.831,13.27119 -5.429,0 -9.83,-5.94172 -9.83,-13.27119 0,-7.32947 4.401,-13.27119 9.83,-13.27119 5.429,0 9.831,5.94172 9.831,13.27119 z"
+         sodipodi:ry="13.271187"
+         sodipodi:rx="9.8305082"
+         sodipodi:cy="129.27118"
+         sodipodi:cx="16760.033"
+         id="path6289"
+         style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.58443311,0,0,0.39706542,-9951.2887,-74.352818)"
+         d="m 16820,191.20338 c 0,6.78655 -6.602,12.28814 -14.746,12.28814 -8.144,0 -14.746,-5.50159 -14.746,-12.28814 0,-6.78655 6.602,-12.28813 14.746,-12.28813 8.144,0 14.746,5.50158 14.746,12.28813 z"
+         sodipodi:ry="12.288136"
+         sodipodi:rx="14.745763"
+         sodipodi:cy="191.20338"
+         sodipodi:cx="16805.254"
+         id="path6291"
+         style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.67434588,0,0,0.62041473,-11438.432,-116.14312)"
+         d="m 16774.78,220.69492 c 0,5.7007 -5.501,10.32203 -12.288,10.32203 -6.786,0 -12.288,-4.62133 -12.288,-10.32203 0,-5.70071 5.502,-10.32204 12.288,-10.32204 6.787,0 12.288,4.62133 12.288,10.32204 z"
+         sodipodi:ry="10.322034"
+         sodipodi:rx="12.288136"
+         sodipodi:cy="220.69492"
+         sodipodi:cx="16762.492"
+         id="path6293"
+         style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.67434588,0,0,0.62041473,-11474.228,-232.63387)"
+         d="m 16826.881,308.67798 c 0,3.80047 -3.961,6.88135 -8.848,6.88135 -4.886,0 -8.847,-3.08088 -8.847,-6.88135 0,-3.80047 3.961,-6.88136 8.847,-6.88136 4.887,0 8.848,3.08089 8.848,6.88136 z"
+         sodipodi:ry="6.8813558"
+         sodipodi:rx="8.8474579"
+         sodipodi:cy="308.67798"
+         sodipodi:cx="16818.033"
+         id="path6295"
+         style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.67434588,0,0,0.62041473,-11494.779,-197.86962)"
+         d="m 16837.695,331.28815 c 0,5.42924 -2.861,9.83051 -6.39,9.83051 -3.529,0 -6.39,-4.40127 -6.39,-9.83051 0,-5.42924 2.861,-9.83051 6.39,-9.83051 3.529,0 6.39,4.40127 6.39,9.83051 z"
+         sodipodi:ry="9.8305082"
+         sodipodi:rx="6.3898306"
+         sodipodi:cy="331.28815"
+         sodipodi:cx="16831.305"
+         id="path6297"
+         style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.67434588,0,0,0.62041473,-11319.768,-235.07347)"
+         d="m 16817.05,382.89832 c 0,3.529 -2.861,6.38983 -6.39,6.38983 -3.529,0 -6.39,-2.86083 -6.39,-6.38983 0,-3.52901 2.861,-6.38984 6.39,-6.38984 3.529,0 6.39,2.86083 6.39,6.38984 z"
+         sodipodi:ry="6.3898306"
+         sodipodi:rx="6.3898306"
+         sodipodi:cy="382.89832"
+         sodipodi:cx="16810.66"
+         id="path6299"
+         style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.67434588,0,0,0.62041473,-11496.105,-131.39059)"
+         d="m 16835.728,393.71185 c 0,4.61486 -3.961,8.35594 -8.847,8.35594 -4.886,0 -8.848,-3.74108 -8.848,-8.35594 0,-4.61485 3.962,-8.35593 8.848,-8.35593 4.886,0 8.847,3.74108 8.847,8.35593 z"
+         sodipodi:ry="8.3559322"
+         sodipodi:rx="8.8474579"
+         sodipodi:cy="393.71185"
+         sodipodi:cx="16826.881"
+         id="path6311"
+         style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.32933172,0,0,0.41360982,-5655.0571,-44.378318)"
+         d="m 16793.458,385.35593 c 0,6.51508 -9.463,11.79661 -21.136,11.79661 -11.673,0 -21.135,-5.28153 -21.135,-11.79661 0,-6.51509 9.462,-11.79661 21.135,-11.79661 11.673,0 21.136,5.28152 21.136,11.79661 z"
+         sodipodi:ry="11.79661"
+         sodipodi:rx="21.135593"
+         sodipodi:cy="385.35593"
+         sodipodi:cx="16772.322"
+         id="path6313"
+         style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.67434588,0,0,0.62041473,-11460.307,-121.02232)"
+         d="m 16796.407,348.98306 c 0,4.34339 -4.402,7.86441 -9.831,7.86441 -5.429,0 -9.83,-3.52102 -9.83,-7.86441 0,-4.34339 4.401,-7.8644 9.83,-7.8644 5.429,0 9.831,3.52101 9.831,7.8644 z"
+         sodipodi:ry="7.8644066"
+         sodipodi:rx="9.8305082"
+         sodipodi:cy="348.98306"
+         sodipodi:cx="16786.576"
+         id="path6315"
+         style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.67434588,0,0,0.62041473,-11371.478,-232.63387)"
+         d="m 16805.255,333.74576 c 0,4.07193 -2.861,7.37288 -6.39,7.37288 -3.529,0 -6.39,-3.30095 -6.39,-7.37288 0,-4.07193 2.861,-7.37288 6.39,-7.37288 3.529,0 6.39,3.30095 6.39,7.37288 z"
+         sodipodi:ry="7.3728814"
+         sodipodi:rx="6.3898306"
+         sodipodi:cy="333.74576"
+         sodipodi:cx="16798.865"
+         id="path6317"
+         style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.77068099,0,0,0.50408697,-12961.624,-208.50473)"
+         d="m 16774.779,341.11865 c 0,4.34339 -4.621,7.86441 -10.322,7.86441 -5.701,0 -10.322,-3.52102 -10.322,-7.86441 0,-4.34339 4.621,-7.8644 10.322,-7.8644 5.701,0 10.322,3.52101 10.322,7.8644 z"
+         sodipodi:ry="7.8644066"
+         sodipodi:rx="10.322034"
+         sodipodi:cy="341.11865"
+         sodipodi:cx="16764.457"
+         id="path6323"
+         style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.67434588,0,0,0.62041473,-11425.836,-191.16073)"
+         d="m 16895.696,284.10168 c 0,4.3434 -3.081,7.86441 -6.882,7.86441 -3.8,0 -6.881,-3.52101 -6.881,-7.86441 0,-4.34339 3.081,-7.8644 6.881,-7.8644 3.801,0 6.882,3.52101 6.882,7.8644 z"
+         sodipodi:ry="7.8644066"
+         sodipodi:rx="6.8813558"
+         sodipodi:cy="284.10168"
+         sodipodi:cx="16888.814"
+         id="path6325"
+         style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.67434588,0,0,0.62041473,-11437.104,-94.796648)"
+         d="m 17088.373,290 c 0,8.14386 -5.061,14.74576 -11.305,14.74576 -6.243,0 -11.305,-6.6019 -11.305,-14.74576 0,-8.14386 5.062,-14.74576 11.305,-14.74576 6.244,0 11.305,6.6019 11.305,14.74576 z"
+         sodipodi:ry="14.745763"
+         sodipodi:rx="11.305085"
+         sodipodi:cy="290"
+         sodipodi:cx="17077.068"
+         id="path6327"
+         style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.67434588,0,0,0.62041473,-11466.274,-124.6817)"
+         d="m 16837.695,146.96609 c 0,4.07193 -5.281,7.37289 -11.797,7.37289 -6.515,0 -11.796,-3.30096 -11.796,-7.37289 0,-4.07192 5.281,-7.37288 11.796,-7.37288 6.516,0 11.797,3.30096 11.797,7.37288 z"
+         sodipodi:ry="7.3728814"
+         sodipodi:rx="11.79661"
+         sodipodi:cy="146.96609"
+         sodipodi:cx="16825.898"
+         id="path6329"
+         style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.67434588,0,0,0.62041473,-11460.97,-108.82431)"
+         d="m 16945.831,414.35593 c 0,3.529 -3.521,6.38983 -7.864,6.38983 -4.344,0 -7.865,-2.86083 -7.865,-6.38983 0,-3.52901 3.521,-6.38983 7.865,-6.38983 4.343,0 7.864,2.86082 7.864,6.38983 z"
+         sodipodi:ry="6.3898306"
+         sodipodi:rx="7.8644066"
+         sodipodi:cy="414.35593"
+         sodipodi:cx="16937.967"
+         id="path6331"
+         style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         sodipodi:type="arc" />
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="BADGE"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <g
+       style="display:inline"
+       transform="translate(-340.00001,-581)"
+       id="g4394"
+       clip-path="none">
+      <g
+         id="g855">
+        <g
+           inkscape:groupmode="maskhelper"
+           id="g870"
+           clip-path="url(#clipPath873)"
+           style="opacity:0.6;filter:url(#filter891)">
+          <path
+             transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-237.54282)"
+             d="m 264,552.36218 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62741 5.37258,-12 12,-12 6.62742,0 12,5.37259 12,12 z"
+             sodipodi:ry="12"
+             sodipodi:rx="12"
+             sodipodi:cy="552.36218"
+             sodipodi:cx="252"
+             id="path844"
+             style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             sodipodi:type="arc" />
+        </g>
+        <g
+           id="g862">
+          <path
+             sodipodi:type="arc"
+             style="color:#000000;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="path4398"
+             sodipodi:cx="252"
+             sodipodi:cy="552.36218"
+             sodipodi:rx="12"
+             sodipodi:ry="12"
+             d="m 264,552.36218 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62741 5.37258,-12 12,-12 6.62742,0 12,5.37259 12,12 z"
+             transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-238.54282)" />
+          <path
+             transform="matrix(1.25,0,0,1.25,33,-100.45273)"
+             d="m 264,552.36218 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62741 5.37258,-12 12,-12 6.62742,0 12,5.37259 12,12 z"
+             sodipodi:ry="12"
+             sodipodi:rx="12"
+             sodipodi:cy="552.36218"
+             sodipodi:cx="252"
+             id="path4400"
+             style="color:#000000;fill:#dd4814;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             sodipodi:type="arc" />
+          <path
+             sodipodi:type="star"
+             style="color:#000000;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="path4459"
+             sodipodi:sides="5"
+             sodipodi:cx="666.19574"
+             sodipodi:cy="589.50385"
+             sodipodi:r1="7.2431178"
+             sodipodi:r2="4.3458705"
+             sodipodi:arg1="1.0471976"
+             sodipodi:arg2="1.6755161"
+             inkscape:flatsided="false"
+             inkscape:rounded="0.1"
+             inkscape:randomized="0"
+             d="m 669.8173,595.77657 c -0.39132,0.22593 -3.62645,-1.90343 -4.07583,-1.95066 -0.44938,-0.0472 -4.05653,1.36297 -4.39232,1.06062 -0.3358,-0.30235 0.68963,-4.03715 0.59569,-4.47913 -0.0939,-0.44198 -2.5498,-3.43681 -2.36602,-3.8496 0.18379,-0.41279 4.05267,-0.59166 4.44398,-0.81759 0.39132,-0.22593 2.48067,-3.48704 2.93005,-3.4398 0.44938,0.0472 1.81505,3.67147 2.15084,3.97382 0.3358,0.30236 4.08294,1.2817 4.17689,1.72369 0.0939,0.44198 -2.9309,2.86076 -3.11469,3.27355 -0.18379,0.41279 0.0427,4.27917 -0.34859,4.5051 z"
+             transform="matrix(1.511423,-0.16366377,0.16366377,1.511423,-755.37346,-191.93651)" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
 
=== modified file 'metadata.yaml'
--- metadata.yaml	2012-07-23 22:32:05 +0000
+++ metadata.yaml	2014-04-08 00:50:29 +0000
@@ -1,4 +1,3 @@
-ensemble: formula
 name: byobu-classroom
 summary: "Remote terminal classroom over https"
 description: |
@@ -6,6 +5,8 @@
  using https, ajaxterm, and byobu.  It operates in a one-writer,
  many reader mode.
 maintainer: Mark Mims <[e-mail]>
+categories:
+  - applications
 provides:
   website:
     interface: https