Fixed a bug when uploading images.
Merge branch 'master' of https://github.com/getshop/applications