event auditing closes #20
Merge branch 'master' into event_updates

Conflicts:
	app/models/event.rb