Prepopulate addevent page with date
Merge branch 'addeventpage'
Fix merge conflict