update
update
update
Merge branch 'sherpa-v0.8-jerry-wip' of https://github.com/DellGDC/sherpa into sherpa-v0.8-jerry-wip
timing option
global data applied to every state
Merge branch 'sherpa-v0.8-jerry-wip' into sherpa-v0.8-bo-wip

Conflicts:
	_sherpa/lib/sherpa-directives.js