Fixed composer and removed redundant travis config
Merge branch 'develop' into enhancement/updated-tests
fixed merge conflicts
Merge branch 'enhancement/updated-tests' into develop