<hr>

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

<h4>Commit Summary</h4>
<ul>
  <li>added serval keyring upload, download, and creation functionality</li>
  <li>added correct uploading and file checking to keyring uploader.</li>
  <li>Reviewed and updated Serval Keyring labels and explanatory text.</li>
</ul>

<h4>File Changes</h4>
<ul>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/luci-commotion/pull/17/files#diff-0">luasrc/controller/commotion/serval_keyring.lua</a>
    (161)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/luci-commotion/pull/17/files#diff-1">luasrc/view/commotion/serval_keyring.htm</a>
    (76)
  </li>
</ul>

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