Перенос ПАР-10 и ПРМГ
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/data_prmg/dkrm/addcontrols.js
	js/data_prmg/dkrm/algorithms.js