Revert changes
Merge branch 'zhang'

Conflicts:
	Simulation/CSimRig.m
Update