Merge branch 'develop' into feature/module/generator
Added some sort of cell generator
Merge branch 'feature/module/generator' into develop