working copy for batch job generator and updated model
Merge branch 'master' of https://github.com/cjjavellana/citrus