Merge branch 'master' into s20_exponential_retry_job

Conflicts:
	taxcalculator/taxcalculator-batch/src/main/java/be/cegeka/batchers/taxcalculator/batch/CallWebserviceProcessor.java