updated composer
Merge branch 'develop'
fixed composer
Merge branch 'master' into develop
updated composer