Scaffold commit
Added validations for models
Merge remote-tracking branch 'origin/master'