for pull
Merge branch 'master' of github.com:shnellpavel/STP_labs

Conflicts:
	Calculator-build-desktop-Qt_4_8_3___PATH___________________/Calculator
	Calculator-build-desktop-Qt_4_8_3___PATH___________________/Makefile
	Calculator-build-desktop-Qt_4_8_3___PATH___________________/calcinterface.o
	Calculator-build-desktop-Qt_4_8_3___PATH___________________/moc_calcinterface.cpp
	Calculator-build-desktop-Qt_4_8_3___PATH___________________/moc_calcinterface.o
	Calculator-build-desktop-Qt_4_8_3___PATH___________________/tctrl.o
	Calculator-build-desktop-Qt_4_8_3___PATH___________________/teditor.o
	Calculator-build-desktop-Qt_4_8_3___PATH___________________/ui_calcinterface.h
for push