update
Merge branch 'master' of https://github.com/gsdocker/gsu3d

Conflicts:
	gsu3d.userprefs