Updated composer.json
Updated vendors
Merge branch 'develop'