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
Update composer.json
add class to compile
Add branch alias
Update dependencies
Update dependencies
Fix typo
add provider and context dialog to commands; fix cs
update and fix command line documentation
Merge pull request #285 from gimler/command_pimp

add provider and context dialog to commands; fix cs
Fix composer.json
Merge remote-tracking branch 'origin/master' into liip_imagine

Conflicts:
	DependencyInjection/SonataMediaExtension.php