Dropbox sync conflicts. Add functionality to form builder.

There are several files that are conflicting in Dropbox include the .git
folder. I haven't deleted them yet for safety reasons.