dev4:1
master: 5
dev3:3
Merge branch 'dev4' into dev3
Merge branch 'dev3'

Conflicts:
	src/test/B.java