Merge branch 'develop'
Updated composer.json.
Merge branch 'master' into develop
Fixed dep.