crisisType name display instead of crisisTypeID
Merge remote-tracking branch 'origin/master'