CONN-225: WIP Resolved compilation error and jar conflicts between the last two merged pulls.
Merge pull request #28 from mlandis5am/master

CONN-225: WIP Resolved compilation error and jar conflicts between the last two merged pulls.