Changed hard-coded event location
Merge branch 'dev' into mntnorv-dev
Added a ContentProvider