Merge branch 'michel' into Lilly

Conflicts:
	drivers/AH2550A.py
Merge branch 'Lilly' of https://github.com/gervaislab/g2python into Lilly