Patch Set 14: IP review completed

fixed last failing test by taking care of File/Directory conflict case #20.

Now all tests succeed. Still there are questions in ReadTreeTest.java regarding commented-out tests.