test
Merge branch 'master' of https://github.com/bossdbz/GTH

Conflicts:
	GTH.userprefs