Синхронизируем с димой

Signed-off-by: Lik24 <hammer-rav@mail.ru>
Merge branch 'master' of github.com:Lik24/3Sim

Conflicts:
	2be_0.7/2exe/Gl_prm.txt

Signed-off-by: Lik24 <hammer-rav@mail.ru>
Димино

Signed-off-by: Lik24 <hammer-rav@mail.ru>