add support for easy-thumbnails
Merge branch 'easy-thumbnails'