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

Conflicts:
	src/Test.java
br7-4
br7-5
Merge remote-tracking branch 'origin/br7' into br7
Merge branch 'br7'