upadted MachineService
fixed applicationContext.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	pujcovnaStroju/pujcovnaStroju_Backend/src/main/resources/applicationContext.xml