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

Conflicts:
	cns/socket_test/sim_server.c
	cns/socket_test/sim_socket_r.o
	cns/socket_test/sim_socket_r.so
cns