Update .travis.yml
Update .travis.yml
Update composer.json
Update composer.json
Update Resources/doc/generator/embed-types.md
Update Resources/doc/generator/embed-types.md
Merge remote-tracking branch 'upstream/master'
change block name entity->object