update
Merge remote-tracking branch 'alex/master'

Conflicts:
	matlab/run_rm_scenarios.m
added on/off events