Commit to be able to merge this file
Merge branch 'master' of https://github.com/resultares/esolutions
Merge branch 'master' of https://github.com/resultares/esolutions

Conflicts:
	Resultares/stepResultaresScheduleTraining.js resolved merge conflicts