Add a record list for event_has_eventtype
Merge from master and resolve conflicts
Merge pull request #19 from mfairchild365/issue-14

Add a record list for event_has_eventtype