fix tutorial build
fixed invalid references to sm event args
State machine in state gen fixed
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into 31_EAP
update to EAP 20