Debug
Merge branch 'master' of github.com:Yaroslav115/Gera

Conflicts:
	gerasrv/server/main.cpp
Fix