Renamed command in demo folder
Merge branch 'develop' into ContentLoader

Conflicts:
	DemoApp/CliConfig.php