Completed form validation
Merge branch 'form_validation' into develop