Fix some wrongfully merged artifacts
Merged from branch
Update Version to 1.1.1
Removed unnecessairy dependencies
Move ch.sahits.codegen.java.datatools to trunk directory