initial events implementation
Merge branch 'master' into events

Conflicts:
	story.js
added event hooks
Merge branch 'events'

Conflicts:
	story.js