Merge branch 'hotfix-0.21' into develop
Merge branch 'hotfix-0.22' into develop
Added GridGenerator to graphics module
Final for version 0.3
Merge branch 'develop'