breaking it again
fixing forms
Merge branch 'feature/appFormFixes' into develop