ya eby, eto zdelano git->commit
Merge branch 'master' of https://github.com/ValeraProj/Valera3D

Conflicts:
	tests/Test_1/Test_1.cpp