Merge branch 'hotfix/3.0.1'
add composer to travis
Merge branch 'hotfix/3.0.2' into develop