Form template finished.
Merge branch 'eduard' into milestone1