Added new method getSAXSSamples
Updated method getSaxsSamples
modify query to use Macromolecule instead of Stocksolution

 * fixes problem created in f8dbed7
Merge branch '8.36' of ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-scm.git into 8.36