br change
Merge branch 'BR_1.0.0'

Conflicts:
	test6.txt
2
3
5
Merge remote-tracking branch 'origin/BR_1.0.0'

Conflicts:
	test6.txt