[TMorris and DPark] Added new event types and edit event types names
Merge branch 'master' of https://github.com/ThoughtWorksInc/ffstrike