Need to sync
Merge branch 'master' of https://github.com/ainikolaev2013/Master-s

Conflicts:
	EVM_Matlab/run_tests_general.m