Analysis changed by Magnetometry project
Merge branch 'master' of https://github.com/teamdiamond/analysis

Conflicts:
	lib/m2/ssro/sequence.py
Merge branch 'master' of https://github.com/teamdiamond/analysis