Merge pull request #172 from zijistark/alpha

Existing trait files renamed to match identical HIP file load order
Update 00_retinue_subunits.txt

Fixing 3 retinue errors
Update 00_retinue_subunits.txt

Fixing 3 retinue errors.
Merge pull request #176 from bnormoyle/beta

Beta
defines.lua compatibility with patch 2.1.5.6