Signed-off-by: nickgagin <nickgagin@yandex.ru>
Merge branch 'master' of https://github.com/verzhak/platform.git

Conflicts:
	main/modules/main.cpp