Merge XML and VFP support to this branch.
51 files changed