Add auto merge for strings separated with characters and words. Including Android test and Desktop test.
Merge branch 'develop' of https://github.com/yukuku/androidbible-sync into develop