Merge branch 'master' of https://github.com/motech/MOTECH-Pentaho-Project into pentaho-module-0.21-snapshot
Fixed bug related to no transId included in weekly and monthly jobs
accept maven additions to gitignore
Merge remote-tracking branch 'origin/pentaho-module-0.21-snapshot' into icappr-0.21-update