Merge branch 'master' of github.com:qreal/qreal into trikDemos

Conflicts:
	plugins/robots/robots.pro
	plugins/robots/robotsGeneratorBase/converters/templateParametrizedMultiConverter.h
	plugins/robots/robotsGeneratorBase/parts/engines.h
	plugins/robots/robotsGeneratorBase/parts/subprograms.h
	plugins/robots/robotsGeneratorBase/parts/variables.h
	plugins/robots/robotsInterpreter/customizer.cpp
	plugins/robots/trikGenerator/trikGenerator_ru.qm
	plugins/robots/trikGenerator/trikGenerator_ru.ts
Merge branch 'trikDemos' of github.com:qreal/qreal into trikDemos
Rebrending for 2D model to Trik Studio
Rebrended icon and title
Merge branch 'trikDemos' of github.com:qreal/qreal into trikDemos

Conflicts:
	plugins/robots/robotsGeneratorBase/converters/templateParametrizedMultiConverter.h
	plugins/robots/robotsGeneratorBase/parts/engines.h
	plugins/robots/robotsGeneratorBase/parts/variables.h
	plugins/robots/robotsInterpreter/customizer.cpp
	plugins/robots/trikGenerator/converters/backgroundColorConverter.h
	plugins/robots/trikGenerator/converters/ledColorConverter.h
	plugins/robots/trikGenerator/simpleGenerators/ledGenerator.cpp
	plugins/robots/trikGenerator/simpleGenerators/ledGenerator.h
	plugins/robots/trikGenerator/simpleGenerators/sadSmileGenerator.cpp
	plugins/robots/trikGenerator/simpleGenerators/sadSmileGenerator.h
	plugins/robots/trikGenerator/simpleGenerators/setBackgroundGenerator.cpp
	plugins/robots/trikGenerator/simpleGenerators/setBackgroundGenerator.h
	plugins/robots/trikGenerator/simpleGenerators/smileGenerator.cpp
	plugins/robots/trikGenerator/simpleGenerators/smileGenerator.h