Fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	generator-ezhtml-generator/package.json