Done

Signed-off-by: Developer B
sdf
Merge branch 'conflict_trunk_developer_B' of github.com:FireFry/MyProject into conflict_trunk_developer_B

Conflicts:
	src/com/firefry/testmodel/git/conflict/ConflictKeeper.java