TextField and Checkbox for site inspection form
Fixing merge conflicts
Merge branch 'master' of https://github.com/SOLA-TONGA/clients

Conflicts:
	swing/desktop/src/main/java/org/sola/clients/swing/desktop/workflow/SiteInspectionForm.form
	swing/desktop/src/main/java/org/sola/clients/swing/desktop/workflow/SiteInspectionForm.java
Modify Site Inspection and Site Inspection Report