Merge branch 'develop'
update composer