fixed unresolved conflict on composer.json
Merge branch 'dev/master' of https://github.com/comem/rockit into dev/master
Merge branch 'dev/master' of https://github.com/comem/rockit into dev/master