merge w dukat
Merge remote-tracking branch 'github/master'

Conflicts:
	Helimak/BOUT_hlmk_2D.inp
	Helimak/makefile
balance Te source