<p>Fixes include paths</p>

<hr>

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

<h4>Commit Summary</h4>
<ul>
  <li>Fixing serval.h path in serval-dna.c</li>
  <li>Fixed conf.h path in serval-dna.c</li>
  <li>Fixed include paths in client.c and crypto.c</li>
  <li>include path merge conflict</li>
</ul>

<h4>File Changes</h4>
<ul>
  <li>
    <strong>M</strong>
    <a href="https://github.com/opentechinstitute/commotiond/pull/64/files#diff-0">plugins/serval-dna/client.c</a>
    (8)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/opentechinstitute/commotiond/pull/64/files#diff-1">plugins/serval-dna/crypto.c</a>
    (10)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/opentechinstitute/commotiond/pull/64/files#diff-2">plugins/serval-dna/serval-dna.c</a>
    (4)
  </li>
</ul>

<h4>Patch Links:</h4>
<ul>
  <li><a href='https://github.com/opentechinstitute/commotiond/pull/64.patch'>https://github.com/opentechinstitute/commotiond/pull/64.patch</a></li>
  <li><a href='https://github.com/opentechinstitute/commotiond/pull/64.diff'>https://github.com/opentechinstitute/commotiond/pull/64.diff</a></li>
</ul>