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

Conflicts:
	cns/cpp/r_package/r_scripts/gen_test_data.R