++ Merge branch 'master' of 192.30.252.131:new-parus/parus_and_examples
++
Merge branch 'master' of 192.30.252.131:new-parus/parus_and_examples

Conflicts:
	src/core/network_speed.h

new-parus/parus_and_examples,new-parus/parus_and_examples,new-parus/parus_and_examples,new-parus/parus_and_examples,new-parus/parus_and_examples