cloning phases and forms
Merge branch 'incident_definition' into idmerge