Create auto gen
Merge remote-tracking branch 'origin/master'

Conflicts:
	Cli/Command.php
Create auto gen