Merge branch 'master' of https://github.com/nadezhdin-ivan/shdt

Conflicts:
	src/random/randomgen.cpp
	src/random/randomgen.h
Merge branch 'master' of https://github.com/nadezhdin-ivan/shdt

Conflicts:
	src/random/randomgen.cpp
	src/random/randomgen.h