Created the controversy and incident types

Created the controversy and incident types

Added a number of attributes to the "Controversy" type and created a new "Incident" type. Created a number of attributes for each.