form controllers for New O / AS / A properly displaying on the page
Merge branch 'automateForms' into develop