fix ODM/MediaEventSubscriber.php
merge upstream/master
[MINOR] MongoDB manager parameters fixed
Merge pull request #259 from eymengunay/master

[MINOR] MongoDB manager parameters fixed
Merge pull request #254 from dao/master

Fix Listener/ODM/MediaEventSubscriber
Fix tests
Merge pull request #269 from pokap/master

Fix tests
Apply PHP-CS-Fixer
Apply sonata_urlsafeid to templates
PHPCR fixes + add gallery support
Merge pull request #272 from beeldspraak/sonata_urlsafeid

Apply sonata_urlsafeid to templates
PHPCRGenerator: add test
Merge pull request #271 from beeldspraak/phpcr

PHPCR add missing features
Fixes setting metadata when loading files to Amazon S3 (PR 266)
Merge pull request #266 from xaben/contenttypefix

Fix passing the correct content-type to Amazon S3
Update composer.json
Make the metadata builder optional
Merge branch 'refs/heads/sonata-master' into master-merge_sonata

Conflicts:
	composer.json
Merge branch 'refs/heads/master-merge_sonata'
Merge remote-tracking branch 'refs/remotes/origin/master' into rmzamora-master

Conflicts:
	composer.json