add form helper
Merge branch 'raysmond'