Bug fix
Bug fix
Merge origin/master

Conflicts:
	src/VisioCrudModeler/Generator/CodeLibraryAssets/code.php
	src/VisioCrudModeler/Generator/CodeLibraryAssets/list.phtml
	src/VisioCrudModeler/Generator/ControllerGenerator.php
	src/VisioCrudModeler/Generator/ModuleGenerator.php
	src/VisioCrudModeler/Generator/ViewGenerator.php