commented documenting
Merge branch 'master' into mtaylor

Conflicts:
	lib/tasks/sp_event_names.rake