update
Merge branch 'master' of https://github.com/fanghuixing/UPPAAL

Conflicts:
	PSDS/SubwayControlSystem.q
	PSDS/SubwayControlSystem.xml