Merge branch 'develop'
composer fix
Update component,json
Merge branch 'master' into develop