Feature/composer update

Updated composer and vendor tree