Added new fields to Hazard and Cause forms.
Merge branch 'functionality-refactoring' into develop