Beginning of edit event work
Merge branch 'edit-events'

* edit-events:
  Beginning of edit event work

Conflicts:
	mysite/code/EventCreatePage.php