improved exception on generation failure
tweaked background filter
fixed exception
Merge pull request #321 from digitalkaoz/error_message_improvement

improved exception on generation failure
Merge pull request #319 from digitalkaoz/background_image

added background_image filter
added s3 proxy cache resolver
ProxyResolver now acts as a decorator for every other Resolver
added fix for Symfony2.0
Merge pull request #318 from digitalkaoz/s3_proxy_cache

added proxy cache resolver
fixed ProxyResolver->getBrowserPath
Merge pull request #323 from digitalkaoz/proxy_resolver_fix

fixed ProxyResolver->getBrowserPath
Update filters.md

miss "filters" in watermark example config
Merge pull request #327 from herb123456/patch-1

Update filters.md
Fixed GridFsLoader according to liip/LiipImagineBundle#305
Merge pull request #331 from peterrehm/master

GridFSLoader Bug
merge latest change in master to dev
Merge pull request #334 from formapro-forks/merge-master

Merge latest changes in master to develop branch