Merge pull request #318 from masal/master

Use id instead of to_param for update form id
simplify form_id on base_form