Bug fixes on the form builder and preparing it to support new features.

git-svn-id: https://plugins.svn.wordpress.org/booking-calendar-contact-form/trunk@777362 b8457f37-d9ea-0310-8a92-e5e31aec5664