added forms
updated forms
Merge branch 'master' into roger
..
Merge branch 'roger'