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

Conflicts:
	cns/py/my/mysrc/main.py