SCI-637 Diffraction data added to importer
Merge branch 'master' of git@github.com:DawnScience/dawn-common.git

Conflicts:
	org.dawnsci.persistence/src/org/dawnsci/persistence/internal/PersistentFileImpl.java