form builder fixes
Merge branch 'master' of https://github.com/templar92/Agilis