Added model validation and other form modifications
 merging conflicts
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