updated composer
Merge branch 'develop'
updated composer