fixed a problem where the upload image where scaled outside of the frame.
Merge branch 'master' of https://github.com/getshop/applications