submit TST1104
Finished REQ9401_TST591.
Solve conflict
Merge branch 'master' of github.com:YouwenYao/Sashimi

Conflicts:
	NformTester/NformTester/NformTester.csproj.rxuser
Merge branch 'master' of github.com:YouwenYao/Zoe

Conflicts:
	NformTester/NformTester/Devices.ini
	NformTester/NformTester/NformRepository.cs
	NformTester/NformTester/NformTester.csproj
	NformTester/NformTester/NformTester.csproj.rxuser
	NformTester/NformTester/NformTester.rxtst
Finished REQ9501_TST1330.
Solve conflict.
Finished REQ9380_TST744.