fixed #1098
some fixes for 1098
Merge branch 'master' of https://github.com/qreal/qreal into #1098

Conflicts:
	plugins/robots/robotsInterpreter/robotsPlugin.cpp
	qrutils/graphicsUtils/colorListEditor.cpp
	qrutils/graphicsUtils/colorlisteditor.h