BM26a: Merge changes implemented locally on bm26a (ESRF)
BM26a: Merge changes implemented locally on bm26a (ESRF)
BM26a: Configuration changes moving from 8-30 to master
TANGO: Added dummy code for reading scalers
Merge branch 'master' of ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-scm.git

Conflicts:
	configurations/bm26a-config/servers/main/live/server.xml
Merge branch 'master' of ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-scm.git
Merge branch 'master' of ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-scm.git

Conflicts:
	configurations/b21-config/processing/biosaxs.sh
BM26a: added max fluo rate to properties, reinstagated sample_elements
and modifies samplestage naming.
BM26a: add .gitignore