edited a authorizaion issue
Merge remote-tracking branch 'origin/master'

Conflicts:
	themes/classic/partials/event-instance-list.hbs