corrected text
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/modules/events/views/view-event.client.view.html
rebuild