tst
Merge branch 'master' of https://github.com/pimms/gfh_gj

Conflicts:
	gfh_gj.userprefs