Moving things to java.nio.file
Merge branch 'master' of ssh://dascgitolite@dasc-git.diamond.ac.uk/scisoft/scisoft-ui.git

Conflicts:
	uk.ac.diamond.sda.navigator/src/uk/ac/diamond/sda/navigator/views/FileLabelProvider.java
Changed to using Soft references for the directory cache.
Merge branch 'master' of ssh://dascgitolite@dasc-git.diamond.ac.uk/scisoft/scisoft-ui.git