Unified template style for variable declarations
Merge branch 'new-generators' of github.com:dvvrd/qreal into trikDemos