Fixed issue with the Merge Tag selector for the HTML field content setting not showing form fields.
Fixed an issue where Number fields with calculations were not showing correct results in some cases.
Refactored to use GP_Plugin as the base PHP class.
