stae1->y, stae3->statex
Merge branch 'b2'

Conflicts:
	MergeBug2/models/MergeBug2/p1/comp1/pkg1/class1/ClassStateMachine/ClassStateMachine.xtuml