magnet-tools - JULIA
Merge branch 'master' of https://github.com/teamdiamond/measurement

Conflicts:
	lib/tools/magnet_tools.py