Fixed bugs in Generator
Merge branch 'development' of git@github.com:lunifera/lunifera-dsl.git into development