Some changes with UI(canvas be created by f)
Merge branch 'master' of https://github.com/levshits/OSISP-1

Conflicts:
	OSISP_1/Instrument.h
	OSISP_1/UI.cpp
Integrate changes of Dasha