update media-bundle
Merge branch 'master' of git://github.com/concerto-cms/CoreBundle

Conflicts:
	composer.json