Add Event resource and association to Location
phase 3
second try
Merge branch 'phase3-event'