update test.txt
Merge remote-tracking branch 'coding.net/Dev' into Dev
Merge remote-tracking branch 'github/Dev' into Dev

Conflicts:
	test.txt