added branch-4
added branch-4-1
added branch-4-2
Merge branches 'branch-4-1' and 'branch-4-2' into branch-4

Conflicts:
	check/test_check.txt
git ignore .orig
Merge branch 'branch-4'