update gravity forms
code clean up
update gforms
merge small conflict on form ids
change out form ids