cns
cns
Merge branch 'master' of https://github.com/alexeyche/alexeyche-junk

Conflicts:
	cns/R/srm/new/eval.R
	cns/R/srm/new/main_ucr.R
	cns/R/srm/new/neuron.R