Added validation logic
Merge branch 'master' of https://github.com/JimHough/FormBuilder