some more prep for this.
Merge branch 'master' of github.com:Shentoza/WesterlandAltis

Conflicts:
	extDB-Build/Altis_Life.Altis/Functions.h