Before update
Merge branch 'master' of https://github.com/malas34/ezhtml-generator

Conflicts:
	generator-ezhtml-generator/package.json