fixed stupid issue
added in correct jar
fixing merge conflicts
Merge branch 'dev' into issue12dev