MS1
MS2
MS3
br7-1,2,3
br7-4
Merge remote-tracking branch 'origin/br7' into br7

Conflicts:
	src/Test.java