update composer
update vendor
Merge branch 'feature/update_framework' into develop