Updating Composer
Merge branch 'develop'