Fixing Merge

Fixed issues when merging Knowledgebase and Master branch. Added the
correct burlap jar.