Michel edits to Ls340
Merge branch 'master' of https://github.com/gervaislab/g2python into michel
snapshot from He3 computer
reverted recordsweep - seems like it was an old version
Merge branch 'master' into michel

Conflicts:
	recordsweep/DataTakerThread.py
	recordsweep/recordsweep.py
	recordsweep/ui_recordsweep_full.py
Merge branch 'scriptable' into michel

Conflicts:
	recordsweep/DataTakerThread.py
	recordsweep/recordsweep.py
Modified only HTL560
only modified HTL560
Improved HTL560
More improvement on HLT560 driver
Added driver for Cryogenic ML 500, modified drivers of LS340 and HLT560 in order to implement an alarm managment system
Modified LS340 driver
talked with the instruments and modified some features
Improved HLT560, added a command interpreter
Now the error_log and the leak_rate=flow are avaliable features on HLT560
modified the display of the physical units
forgot this file
modified readalarmfile and created instrument_list to load instruments from a file in recordsweep
Wrote a function to get the instrument list and parameters and units. I will try to merge the work with scriptable...
Merge branch 'scriptable'