Added model validation and other form modifications
 merging conflicts
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.
refactoring branch to clean up model validation
refactoring branch to clean up model validation part 2
Resolving merge conflicts
Merge pull request #16 from vogelbek/model_validation

Model validation
Resolving merge conflicts