Changed location of import
Removed bootstrap_field (wasn't needed)
LILY-307: Changed phone/email to phone_number/email_address. Also made it so hidden Dataprovider fields always get cleared