Game Update
Merge branch 'BGv1_Khail' into BGv1_Norris