update composer
Merge branch 'develop'