added code and properties to set data grid uuid to the same on everyone's system, also removed the merge tool button from conflict resolver as it's simpler to invoke the merge tool via command line if required
added a plugin architecture for uuid resolution on custom property sets