add dynamic form generation (wip)
fix problem with variables in mail
Merge branch 'develop'