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