Refactor: rename "happening" to "event"
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/definitions.js
remove forgotten symbols from git conflict