[RB_1.0][test.txt][estdragon] modify test.txt for RB_1.0
[master][test.txt][estdragon] modify test.txt for master
Merge branch 'RB_1.0'

Conflicts:
	test.txt