Merge branch 'master' of https://github.com/pimcore/pimcore
Merge branch 'master' of https://github.com/pimcore/pimcore
Resolved issue #1607, The thumbnail overlay effect now has an extra option for origin so that an overlay can be positioned relative to any corner or the center of a thumbnail image.
Revert "Fixed Pimcore issue #1760 - The method getThumbnail() now returns an object with some useful properties instead of a string with a path."

This reverts commit 9d5c492459d65b388cf23da57a2f4a07dcc3ccad.
Revert "Fix for issue #1802 - values in URLs are now properly encoded depending on whether they are in the path or query string. Slashes in path are not encoded allowing %o_path to be effectively used."

This reverts commit 53172db98494ead13b3ee78e4c6a3de823a53ff8.
Merge pull request #53 from John5/issue1607

Added origin selection for thumbnail overlay image positioning (issue #1607)