Merge branch 'trik-generator' of github.com:dvvrd/qreal into new-generators
Fixed trik expressions generating in the float case
Merge branch 'new-generators' of github.com:dvvrd/qreal into trikDemos

Conflicts:
	plugins/robots/robotsGenerator/base/parts/variables.cpp
	plugins/robots/trikGenerator/parts/trikVariables.cpp
Merge branch 'trikDemos' of github.com:qreal/qreal into trikDemos