update name of vendor
Merge branch 'develop'
renamed branch alias
update composer settings