added form validations
Merge branch 'development'