Add endpoint for events. Create objects
Working through merge conflict
Manual overwrite of csproj
Merge branch 'master' into vendor_ui
Events are updated upon modal save