fixed compilation errors
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
event types
loops, compensation, transaction, ad-hoc and event subprocess
data objects, task types, boundary events
ports
Merge branch 'master' of github.com:qreal/qreal into bpmn
Merge pull request #1106 from Ashatta/bpmn

Редактор BPMN
Merge branch 'master' of github.com:qreal/qreal into robots

Conflicts:
	qrutils/qRealDialog.cpp