Merge tweaks
Merge branch 'master' of https://github.com/leo3linbeck/BrevitestCore

Conflicts:
	BrevitestCore/DataFolder/data.WakTDef