adding form to generator instead of copying fields for create and edit
Merge remote-tracking branch 'origin/master'