[Monica, Andrei] split ugly big file in pretty small files
Merge branch 'master' of github.com:cegeka/batchers
Merge remote-tracking branch 'remotes/origin/master' into S30_ProgressBar_Websocket

Conflicts:
	taxcalculator/taxcalculator-presentation/src/main/webapp/resources/js/employee/employee-controllers.js