Update Character and AI functions
Merge remote-tracking branch 'origin/GW's-Branch'
Merge remote-tracking branch 'origin/master' into GW's-Branch