Add forms
Merge branch 'develop'