updated .gitignore for composer.lock
altered path for cli installer control
merge in master
Merge branch 'develop'