Commit before merge
Merge branch 'trikSupportStage2' of github.com:qreal/qreal into trikSupportStage2

Conflicts:
	plugins/robots/interpreters/interpreterBase/include/interpreterBase/robotModel/pluggableDeviceInfo.h
	qrtest/unitTests/pluginsTests/robotsTests/interpretersTests/interpreterBaseTests/interpreterBaseTests.pro