Second Test Conflict.
My Merge

Conflicts:
	Refactor/src/com/filber/refactor/_6_hierarchy/_68_ReplaceDelegationWithInheritance_380.java
My Merge

Conflicts:
	Refactor/src/com/filber/refactor/_6_hierarchy/_68_ReplaceDelegationWithInheritance_380.java