Merge branch 'globalvol' of github.com:nagn/fausnd into error

Conflicts:
	extension/fausnd.ged
	extension/fausnd.gex
	fausnd.cpp