<hr>

<h4>You can merge this Pull Request by running</h4>
<pre>  git pull https://github.com/elationfoundation/commotion-client toolbar</pre>
<p>Or view, comment on, or merge it at:</p>
<p>  <a href='https://github.com/opentechinstitute/commotion-client/pull/31'>https://github.com/opentechinstitute/commotion-client/pull/31</a></p>

<h4>Commit Summary</h4>
<ul>
  <li>Made commotion_assets recreate assets on every build</li>
  <li>Added proposed toolbar icons.</li>
  <li>added new assets to commotion assets</li>
  <li>added new icons to toolbar in assets file</li>
  <li>Added basic toolbar to the main window.</li>
  <li>removed unneeeded tests</li>
  <li>Added toolbar to config_editor</li>
</ul>

<h4>File Changes</h4>
<ul>
  <li>
    <strong>M</strong>
    <a href="https://github.com/opentechinstitute/commotion-client/pull/31/files#diff-0">Makefile</a>
    (2)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/commotion-client/pull/31/files#diff-1">commotion_client/GUI/extension_toolbar.py</a>
    (125)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/opentechinstitute/commotion-client/pull/31/files#diff-2">commotion_client/GUI/main_window.py</a>
    (51)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/opentechinstitute/commotion-client/pull/31/files#diff-3">commotion_client/GUI/system_tray.py</a>
    (2)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/commotion-client/pull/31/files#diff-4">commotion_client/GUI/toolbar.py</a>
    (168)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/commotion-client/pull/31/files#diff-5">commotion_client/GUI/toolbar_builder.py</a>
    (171)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/opentechinstitute/commotion-client/pull/31/files#diff-6">commotion_client/assets/commotion_assets.qrc</a>
    (29)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/commotion-client/pull/31/files#diff-7">commotion_client/assets/images/full_screen_end32.png</a>
    (0)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/commotion-client/pull/31/files#diff-8">commotion_client/assets/images/full_screen_start32.png</a>
    (0)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/commotion-client/pull/31/files#diff-9">commotion_client/assets/images/load32.png</a>
    (0)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/commotion-client/pull/31/files#diff-10">commotion_client/assets/images/save32.png</a>
    (0)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/commotion-client/pull/31/files#diff-11">commotion_client/assets/images/settings32.png</a>
    (0)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/commotion-client/pull/31/files#diff-12">commotion_client/assets/images/user32.png</a>
    (0)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/opentechinstitute/commotion-client/pull/31/files#diff-13">commotion_client/extensions/config_editor/main.py</a>
    (9)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/opentechinstitute/commotion-client/pull/31/files#diff-14">commotion_client/extensions/config_editor/ui/config_manager.ui</a>
    (3585)
  </li>
  <li>
    <strong>D</strong>
    <a href="https://github.com/opentechinstitute/commotion-client/pull/31/files#diff-15">commotion_client/tests/test_util_config.py</a>
    (40)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/opentechinstitute/commotion-client/pull/31/files#diff-16">setup.py</a>
    (2)
  </li>
</ul>

<h4>Patch Links:</h4>
<ul>
  <li><a href='https://github.com/opentechinstitute/commotion-client/pull/31.patch'>https://github.com/opentechinstitute/commotion-client/pull/31.patch</a></li>
  <li><a href='https://github.com/opentechinstitute/commotion-client/pull/31.diff'>https://github.com/opentechinstitute/commotion-client/pull/31.diff</a></li>
</ul>

<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br>Reply to this email directly or <a href='https://github.com/opentechinstitute/commotion-client/pull/31'>view it on GitHub</a>.<img src='https://github.com/notifications/beacon/3074564__eyJzY29wZSI6Ik5ld3NpZXM6QmVhY29uIiwiZXhwaXJlcyI6MTcxNDY2MDI3OSwiZGF0YSI6eyJpZCI6MzEzMTgyNzd9fQ==--272c863b3c7bb53f3feb30f0b10006668c45923e.gif' height='1' width='1'></p>