Adds google-diff-match-patch as a library
Fixes issues in ThreeWayTextDiffTest
Adds implementation of getMerged and JavaDoc