Update SAMADhi and others.
Merge branch 'tmpwork'

Conflicts:
	test/combinePlots_ZjZcZb_2012.py
Some fixes.