Merge branch 'hotfix/travis'
fix composer.json
Merge branch 'hotfix/fix-test' into develop