Merge branch 'master' into b1
test b1 push
Merge branch 'master' into b1

Conflicts:
	discribe.rtf
Revert "Merge branch 'master' into b1"
Revert "Revert "Merge branch 'master' into b1""

This reverts commit 59b239d34eaff8941bbe55a5b50f52639c2d9adc.
Revert "test b1 push"

Conflicts:
	discribe.rtf
delete useless file
b1 push again
Merge branch 'b1'