fix missing filename in exception
Merge pull request #240 from havvg/master

fix missing filename in exception
deprecate the phpcr loader as CmfMediaBundle provides a better one now.
Merge pull request #243 from liip/deprecate-phpcr-loader

deprecate the phpcr loader as CmfMediaBundle provides a better one now.
Set ContentType of AWS cache object

Partial fix for #238
Merge pull request #246 from eXtreme/aws-contenttype

Set ContentType of AWS cache object
Add upscale filter
Fix typo
Update doc
Merge pull request #248 from maximecolin/master

Add Upscale filter
Add comment for image parameter in watermark filter configuration example
Merge pull request #263 from USvER/patch-1

Add comment for image parameter in watermark filter configuration exampl...
Update filters.md

The dynamic filters need a custom controller action, not a custom data loader ...
Merge pull request #267 from uwej711/patch-1

Update filters.md
add test on cyrillic filename for FileSystemLoader
add doctrine/cache to require-dev
Merge pull request #272 from havvg/hotfix/dev-requirements

fix composer require-dev
exclude Tests directory on composer archive
Merge pull request #274 from M6Web/master

Exclude Tests directory on composer archive
Updated depend imagine to version 0.6