Refactoring shops permits to allow images to be uploaded on edit.
Merge pull request #18 from vogelbek/image_refactor

Refactoring shops permits to allow images to be uploaded on edit.
Resolving merge conflicts