moved taxcalculator-application.properties to root resources
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of github.com:cegeka/batchers
Merge branch 'master' into spike_multiple_step_job