Merged modifications for generatorBase fro trikDemos branch
Merge branch 'trikSupportStage2' of github.com:qreal/qreal into trikSupportStage2
Merged trik generator code from trikDemos branch