setting changes
Merge branch 'master' of https://github.com/informaton/sev

Conflicts:
	+detection/detection_plm_calculator.m
	_sev.parameters.txt