Added categories

Added categories for events, created proper associations
Merge branch 'Categories'