Conflicts: README.txt build.xml docs/BuildingJacobFromSource.html docs/ReleaseNotes.html docs/UsingJacob.html