Merge pull request #6 from malconis/master

Jenkns Client + Servlet
Fixing NPE
fixed broken map
merge conflict