Merge branch 'hotfix/travis-composer-update-fix' into develop
- Added file generator
Merge branch 'release/1.3.5'