edited formbuilder components
merged local with remote
field properties
merged form builder
merged
form builder - persistence