Refactor to make LoaderFactory use IDataHolder.
Merge branch 'master' of ssh://dascgitolite@dasc-git.diamond.ac.uk/scisoft/scisoft-ui.git

Conflicts:
	uk.ac.diamond.sda.navigator/META-INF/MANIFEST.MF
Merge branch 'master' of ssh://dascgitolite@dasc-git.diamond.ac.uk/scisoft/scisoft-ui.git
Migrate DataHolder to IDataHolder.